jmyPay/scanPay.git

parent: dfd96742 | 补丁 | 提交 | ignore whitespace

石广澎

2024-07-20 975644ced45e82a81d1d4488492ab9e3840b9605

feat(支付): 支付成功页面

5个文件已修改

	common/config.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	index.html	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	manifest.json	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages.json	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pay/scanpay.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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'

 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>

 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" : {

 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"
    },

 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("支付宝app的浏览器");
        //这个可以关闭安卓系统的手机
        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()

			@@ -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'

			@@ -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>

			@@ -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" : {

			@@ -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"
			},

			@@ -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("支付宝app的浏览器");
			//这个可以关闭安卓系统的手机
			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()