From 975644ced45e82a81d1d4488492ab9e3840b9605 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 20 七月 2024 17:11:52 +0800
Subject: [PATCH] feat(支付): 支付成功页面
---
manifest.json | 6 +-
index.html | 43 +++++++++------------
pages.json | 4 +-
common/config.js | 3 +
pay/scanpay.vue | 5 +-
5 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/common/config.js b/common/config.js
index 18efc97..650ccf2 100644
--- a/common/config.js
+++ b/common/config.js
@@ -3,7 +3,8 @@
// 寮�鍙�
const dev = {
webURL: 'https://sfzf.cpbtsoft.cn',
- baseURL: 'http://172.16.2.117:8080',
+ baseURL: '/dev-api',
+ // baseURL: 'http://172.16.2.117:8080',
sftpURL: 'https://yqzx.jinmingyuan.com/file',
wx_appid: 'wx4c146dba764dcb05',
ali_appid: '2021004149689887'
diff --git a/index.html b/index.html
index 6925918..285d568 100644
--- a/index.html
+++ b/index.html
@@ -1,27 +1,22 @@
<!DOCTYPE html>
<html lang="zh-CN">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
- <title>
- <%= htmlWebpackPlugin.options.title %>
- </title>
- <!-- Open Graph data -->
- <!-- <meta property="og:title" content="Title Here" /> -->
- <!-- <meta property="og:url" content="http://www.example.com/" /> -->
- <!-- <meta property="og:image" content="http://example.com/image.jpg" /> -->
- <!-- <meta property="og:description" content="Description Here" /> -->
- <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
- <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>
- <!-- <script src="<%= BASE_URL %>common/jweixin-1.6.0.js"></script> -->
- <!-- <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script> -->
- </head>
- <body>
- <noscript>
- <strong>Please enable JavaScript to continue.</strong>
- </noscript>
- <div id="app"></div>
- <!-- built files will be auto injected -->
- </body>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+ <meta http-equiv="Content-Security-Policy" content="frame-src https://*.qq.com webcompt:;">
+ <title>
+ <%= htmlWebpackPlugin.options.title %>
+ </title>
+ <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css"/>
+ <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>
+ <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+</head>
+<body>
+<noscript>
+ <strong>Please enable JavaScript to continue.</strong>
+</noscript>
+<div id="app"></div>
+<!-- built files will be auto injected -->
+</body>
</html>
diff --git a/manifest.json b/manifest.json
index 5e5d917..b88dd59 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
- "name" : "閭桨鎯�",
+ "name" : "浣版儬浠�",
"appid" : "__UNI__3E21AAD",
- "description" : "閭桨鎯�",
+ "description" : "浣版儬浠�",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
@@ -79,7 +79,7 @@
"devServer" : {
"proxy" : {
"/dev-api" : {
- "target" : "http://172.16.2.121:8080",
+ "target" : "http://172.16.2.117:8080",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
diff --git a/pages.json b/pages.json
index a3d7f67..63f4dd7 100644
--- a/pages.json
+++ b/pages.json
@@ -41,7 +41,7 @@
{
"path": "pay/login",
"style": {
- "navigationBarTitleText": "閭桨鎯�",
+ "navigationBarTitleText": "浣版儬浠�",
"enablePullDownRefresh": false
// #ifdef H5
,
@@ -53,7 +53,7 @@
],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "閭桨鎯�",
+ "navigationBarTitleText": "浣版儬浠�",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#FFFFFF"
},
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 4c60469..d4222fa 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -100,7 +100,7 @@
</scroll-view>
<view @click="getCoupon" class="coupon-btn">纭畾</view>
</u-popup>
- <u-modal showCancelButton :show="showRemark" title="澶囨敞" cancelText="鍏抽棴" confirmText="娓呴櫎" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="buyerNote = ''">
+ <u-modal showCancelButton :show="showRemark" title="澶囨敞" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
<u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" count></u--textarea>
</u-modal>
</block>
@@ -130,6 +130,7 @@
return {
tips: '璇ュ晢鎴锋殏鏈紑閫氭敮浠樺姛鑳�',
loading: true,
+ remark: '',
buyerNote: '',
showRemark: false,
UNIONID: null,
@@ -201,7 +202,6 @@
clickDone() {
let browser = navigator.userAgent.toLowerCase();
if (browser.match(/Alipay/i) == "alipay") {
- console.log("鏀粯瀹漚pp鐨勬祻瑙堝櫒");
//杩欎釜鍙互鍏抽棴瀹夊崜绯荤粺鐨勬墜鏈�
document.addEventListener("AlipayJSBridgeReady", function () {
AlipayJSBridge.call("closeWindow");
@@ -220,7 +220,6 @@
//杩欎釜鍙互鍏抽棴ios绯荤粺鐨勬墜鏈�
WeixinJSBridge.call("closeWindow");
} else {
- console.log("鍏跺畠娴忚鍣�");
window.opener = null; //濡傛灉娌℃湁杩欒鍜屼笅闈㈢殑涓�琛屽垯浼氬嚭鐜颁笂闈㈢殑绗簩涓闂銆�
window.open(' ', '_self', ' ');
window.close()
--
Gitblit v1.9.1