111

.env

@@ -1,3 +1,8 @@
+# 打包目标
+# H5  - 全部都是使用H5支付
+# APP - 全部都是使用APP支付
+SHOPRO_BUILD_TARGET=H5
+
 # 版本号
 SHOPRO_VERSION=v2.4.1
 
@@ -5,8 +10,8 @@ SHOPRO_VERSION=v2.4.1
 SHOPRO_API_PATH=/app-api
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV == development）
-# SHOPRO_DEV_BASE_URL = https://api.htysapp.com
-SHOPRO_DEV_BASE_URL=https://baac9a029ea84f36ba28c023fed4fc5f.hd.takin.cc
+SHOPRO_DEV_BASE_URL = https://api.htysapp.com
+# SHOPRO_DEV_BASE_URL=https://baac9a029ea84f36ba28c023fed4fc5f.hd.takin.cc
 
 # 后端接口 - 正式环境（通过 process.env.NODE_ENV != development）
 SHOPRO_BASE_URL=https://api.htysapp.com

im-server.htysapp.com_nginx 3/im-server.htysapp.com.csr

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIDCjCCAfICAQAwgZExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
+DgYDVQQHEwdCZWlqaW5nMQ8wDQYDVQQKEwZxY2xvdWQxDzANBgNVBAsTBnFjbG91
+ZDEeMBwGA1UEAxMVaW0tc2VydmVyLmh0eXNhcHAuY29tMRwwGgYDVQQFExM3OTE2
+NTMzOTk2MzI4NDE5ODY1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+sv1qHlmIDEPS7XYSk0KaW/pBEBv5yvXL0DsyMTwgGByJlVSWtihs158pKMLeLQtv
+4rEC72uTEj81XK6iWDHnd1Y/UUtui5qCWIlOUyo9ajXR0WLjJrwUi4iCtwodHk6H
+A/93kY2vG9qI0GeDWYbxLk+3+SUwyN+jAre212QH71sRPwmXbuzWICipwmmw442M
+PKhL7qxOq9lDsC19m/8yLH8dOfftU5W1PrdFjzohBqakUnHrSPMlL3UlPsu1JFqa
+QezsjWTGz6qhcQBGND/iV7droklUFyw7gDqiRR0Wyq8TzeNzUgEWPNrqMJf+Ly+h
+64jxngPO58PfmBwQNDKdgQIDAQABoDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREE
+GTAXghVpbS1zZXJ2ZXIuaHR5c2FwcC5jb20wDQYJKoZIhvcNAQELBQADggEBAIFF
+dv/3JOYnDVwy+v1qLD8ZncitlnNg2jDxbqhAPMhinbx6Itbxs+88a4q+mckkFtz0
+tNfWnSlaYgIHWe26316pw1OE4IrUADO4Vffe2W4JFKIpyzlfnyQeh/rOAXp8RUaO
+VGVrRRZbIsVdF4PuEJxrTWF1eld/FLLQWECJ2V3C/4BSIQsqm8wOZBO4y5OpV/AN
+8rCR7rBjFh+PcjYvsScnNux3X/yqiNUQoUpiU60hj8cYLqwCJlCwvx0Su9dR5iun
+JGe0BX1yjLaSk23h10+y1a06R5OGUTsDvPoW2yJkVrBFkovL6t3DfBKum7AJHR1g
+RmQm5pfNEd3DfVTzoT4=
+-----END CERTIFICATE REQUEST-----

im-server.htysapp.com_nginx 3/im-server.htysapp.com.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAsv1qHlmIDEPS7XYSk0KaW/pBEBv5yvXL0DsyMTwgGByJlVSW
+tihs158pKMLeLQtv4rEC72uTEj81XK6iWDHnd1Y/UUtui5qCWIlOUyo9ajXR0WLj
+JrwUi4iCtwodHk6HA/93kY2vG9qI0GeDWYbxLk+3+SUwyN+jAre212QH71sRPwmX
+buzWICipwmmw442MPKhL7qxOq9lDsC19m/8yLH8dOfftU5W1PrdFjzohBqakUnHr
+SPMlL3UlPsu1JFqaQezsjWTGz6qhcQBGND/iV7droklUFyw7gDqiRR0Wyq8TzeNz
+UgEWPNrqMJf+Ly+h64jxngPO58PfmBwQNDKdgQIDAQABAoIBAB+dk3j454cDE+bN
+zEomoY1NjuCBkIXBFNcbHaqErEaWA9dUsapLSa5sdqC0ivn54zFvgs03eyrl708H
+qbVaW0BBA74gTM5r5EovNp6J/38bMoyBow3ceuSKoEwkhTAtPrv+C+ix1hRdbX0i
+S5kstL0xZ5WidBOHLQv1114EVUJ5z8MT/ZhIRKwIY2HMqcs2d63Bat0ojOte+64n
+Yj8DFpvAH6QT89AyIIeR/NMAp8Z/ilfo/Jo/qawcSaqMi5u3But6E/t+isWnolFX
+LeLzQ91Ro1qGmp1tndVX0J2ZCKblilP/I3q8I8TObv+TOk+8qUTL+0+Nf8LLoGcI
+dCMhnmECgYEA4PrVxdLnci8N4x6BXe5PQpEpa1oMKIVuxgjmmqJZZhbGCDgr+0Ab
+0+yaLeRpnccvACwxkZic/R3UxuskJMOablN6CNgrMO3nOvZ0v0ZIAqAyS2BH9j1g
+farsCM+zjzK6JAXH43vNg0uarjxg6IxAt6s5KKLm5xVXdrC+thtFGssCgYEAy6tD
+MhywAahHjJAXe0xH9E1Z40QNcDEfJRS4osodn4b6d3URTL4/TeklT3aAqU3QFNuy
+AjhKv0AGJTVDpWzmU9wG+0qqJL0WjWEJJ+CsiHvG7K7EN17VORRXfZAXH+vbFF6h
+2qGqUaOJCki7jd/+G5Q7Qp9GUcoIjrSSANn+o2MCgYEA27F2ITiDVEhIullmoM/+
+zBUuqisDpmouMuosLiKNRBjHBu27XR1MT1VDdb8Pt8fyyKtfODscSjvgNOMXp2Lv
+If8YMxzMiHo4i6ZxePrrhMzkcCC0BOwIlo7a8PvJ7vLtPBH9ENIrbKPeh3hkdZHH
+/NMR/PGeo1d+0mNjyDa286MCgYBjejEF5vEovhLEWxS9ClMSxj0jPff6VmPJ7scH
+7ARwCLOJaUqb20h8O2YX29+X0gPSTEQzxV7s7s6RmeSChiAx0YQvdRaJfznmsACS
+07AxsZNFw07fZJhsmrzo/VnuI3sMBfS0HsZbva6PsVq6Py+UNOCE99qW1EE9woCV
+neQ71QKBgQCBuWfeOrEGaZNQn1Pl7jdhY9+EKd6uQuQ9dUn/Q1mp15hrJbnva8Dz
+IEZ3xUrgglUdR1M46EXdFEKuwzijbU4OWdHRQ3Md3Z7y3eSFW+U86nNKl8TjInjO
+5fAnU4vWN0UQvWIwUtnNIOridOATkFhksJ4UyncDLv+Pj5q6+GxPqA==
+-----END RSA PRIVATE KEY-----

im-server.htysapp.com_nginx 3/im-server.htysapp.com_bundle.crt

@@ -0,0 +1,115 @@
+-----BEGIN CERTIFICATE-----
+MIIHITCCBQmgAwIBAgIUbEw16Oxm5tp0dQZvqlg5MhH8e5IwDQYJKoZIhvcNAQEL
+BQAwWzELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xJTAjBgNVBAMTHFRydXN0QXNpYSBEViBUTFMgUlNBIENBIDIwMjQw
+HhcNMjYwNjIyMDQwMDAwWhcNMjYwOTIwMDM1OTU5WjAgMR4wHAYDVQQDExVpbS1z
+ZXJ2ZXIuaHR5c2FwcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCy/WoeWYgMQ9LtdhKTQppb+kEQG/nK9cvQOzIxPCAYHImVVJa2KGzXnykowt4t
+C2/isQLva5MSPzVcrqJYMed3Vj9RS26LmoJYiU5TKj1qNdHRYuMmvBSLiIK3Ch0e
+TocD/3eRja8b2ojQZ4NZhvEuT7f5JTDI36MCt7bXZAfvWxE/CZdu7NYgKKnCabDj
+jYw8qEvurE6r2UOwLX2b/zIsfx059+1TlbU+t0WPOiEGpqRScetI8yUvdSU+y7Uk
+WppB7OyNZMbPqqFxAEY0P+JXt2uiSVQXLDuAOqJFHRbKrxPN43NSARY82uowl/4v
+L6HriPGeA87nw9+YHBA0Mp2BAgMBAAGjggMWMIIDEjAMBgNVHRMBAf8EAjAAMB8G
+A1UdIwQYMBaAFGF1BU4a9Q/BYCAgwijZi7PiwX20MIGXBggrBgEFBQcBAQSBijCB
+hzBDBggrBgEFBQcwAoY3aHR0cDovL2ljYS53dC50cnVzdGFzaWEuY29tL1RydXN0
+QXNpYURWVExTUlNBQ0EyMDI0LmNydDBABggrBgEFBQcwAYY0aHR0cDovL29jc3Au
+d3QudHJ1c3Rhc2lhLmNvbS9UcnVzdEFzaWFEVlRMU1JTQUNBMjAyNDAgBgNVHREE
+GTAXghVpbS1zZXJ2ZXIuaHR5c2FwcC5jb20wEwYDVR0gBAwwCjAIBgZngQwBAgEw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
+bC53dC50cnVzdGFzaWEuY29tL1RydXN0QXNpYURWVExTUlNBQ0EyMDI0LmNybDAd
+BgNVHQ4EFgQUdltCRbULLFkqwGyD8KGJllujctkwDgYDVR0PAQH/BAQDAgWgMIIB
+gAYKKwYBBAHWeQIEAgSCAXAEggFsAWoAdwAlt+/eoRMBk+2TB5dwqjIqJmIN41rI
+qnx1GX3gsangZQAAAZ7t5FoRAAAEAwBIMEYCIQDU7rsiBCJAOMq/zvgURwUO4y+t
+1KAkEFHBVYGXowZJPAIhAIWRui/EAGv8cu40jStpXU/qOsmAQgdkyi2fOPEDqo4/
+AHYA1219ENGn9XfCx+lf1wC/+YLJM1pl4dCzAXMXwMjFaXcAAAGe7eReugAABAMA
+RzBFAiB6NvHf1WyBUTdWWYK2mhz/e7QytNclFeWjU/5TWGENrgIhAPjCxM44Q9Qm
+JOFSXywANvMURq+977PfkKWyGd9AT2RmAHcAr2eIO1ewTt2Pptl+9i6o64EKx3Fg
+8CReVdYML+eFhzoAAAGe7eRf2AAABAMASDBGAiEAoMDPdK+J9TfEy/kHL6e+EQGB
+0AJsLTiMhxOUnZBLp9ACIQCg/fOEY0UVx8MaE27RptKl8lFc5pEXu2jv+gYRrOe6
+ozANBgkqhkiG9w0BAQsFAAOCAgEAeilUjDXR5iSFG3IDxF2R1WQ8Wc5YpPzVMg5X
+nIJY12HPGOIdEVV0Vx95E06etgs2Fw0ApGrtMkS/8ZZHAdwaZnulyQsrp9Cew5pR
+IZ2vqJKy6LymBdDZc0UdGxAbGZU5LlOobAEPyZ3nOOHSVsOnfAXRvgHuAyGZDNw8
+/GPWdxI3X4TO2V3kPS/huVoXYsGfi2YIKvNdB8QPYMRGFpKNzIuhhy545PMS5iO3
+txjp3yeu5xpiFUeTwYmOCQaQgby99RvohvNIFoBVV5GeESrOsyndcW4wIh+C/bxQ
+gbG4uTLDnGLso0Ds+mCCZcFt8hmygAPZBmjDLQufjfOmvtNjFbeZ1+t2OfeNX8OF
+d3o80JiEzc7/nM7v4LAKmjktjYu2uh18VJczCLzFUzBWTEExM7hAlKVpjYYNK3SA
+Cvi5xM7T356+h8tUCECtW7BFnGe3YvI2m3S/3rX8EaiUmDpAQdIUJeszEDnIpkB4
+qHeexhE97AaoPn5FnsEtduvnfMO4aIMF0WQ6TxOp0Lfo2UDzjJaTqZouc+wRq59x
+gOzTS33g+Emm3vV8tXAHUmTAuc9rEayZP/Uo65m6N9QmbWRBrC9w05DV4rET2ilS
+XIKcuTCs1+C2/9cli2cfslf8uXlo5rs5U4N9AFwDs46xTnCWBKTdm0rmx/L+Za8l
+CQtbyB0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGvTCCBKWgAwIBAgIUHJ5rQS3rCoVGHeA9vjCYTQVziIswDQYJKoZIhvcNAQEM
+BQAwWDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcN
+MjQwNTE1MDYxOTE1WhcNMzQwNTE1MDYxOTE0WjBbMQswCQYDVQQGEwJDTjElMCMG
+A1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjElMCMGA1UEAxMcVHJ1
+c3RBc2lhIERWIFRMUyBSU0EgQ0EgMjAyNDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAK2GCKULRuSjgEhVn7j0cnfuSmrxS5/5H77qmOJwWJkMVE+SgBQn
+4mkoxVwF03E517T5YZZumwy5iCxktdnKp5Uq0C7td8yYnZgLb18pUeuzfkJBNWvI
+MccfeGCI6qdnl1nGv15loYjP0TEt7C9VyVrK+zmeTxdkBb5xP/hQPFVRWQROnruX
+gs7G1jbEX3Hhih+OR1dxcQkk7yVM493zuDVBBlNqH4KA/FawaGNcA/KRKHI0cqyT
+Q/GjthO3yyivTlu07/QGV5VTl2oor9ntyXdCmEktu0aKH3kOLRjBE5CiT55Gts7d
+1MBRwI3pAjLtDia4+Sz0XmPB/mH1/KO7EKtg+5XVZe3amDpboawWAS2oaKuDKWx/
+fh5AA0ViSS+8nDAbrxE4b/gPno28GZSG41VELtSxZvgA0T8lc1oBBywQc0BWfCC9
+PoSl2xSxhjKjJfY+od+EALfmEnEH3A53iK4z4gqpBo8O29omZ8HYxO9Tb5aemgla
+gP+8oWmxv6aZwYOpWHb3AqOxEoTMV0VwzfEqLsMGcP6koLCB51uPGu8kDF8PIpbu
+jallH/6K9QySf3S2H4SCme94tAjznz58En48PGoQPCSTDM6CyeEZqR3tEAnUF1gS
+4T+hkEiskHWLQ6QosxoFX2+qMMeQNHictf5O/ZPXvIv34yxE5kiiBWN3AgMBAAGj
+ggF6MIIBdjASBgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFLgHkXlcBvRG
+/XtZylomkadFK/hTMIGTBggrBgEFBQcBAQSBhjCBgzBBBggrBgEFBQcwAoY1aHR0
+cDovL2ljYS53dC50cnVzdGFzaWEuY29tL1RydXN0QXNpYVRMU1JTQVJvb3RDQS5j
+cnQwPgYIKwYBBQUHMAGGMmh0dHA6Ly9vY3NwLnd0LnRydXN0YXNpYS5jb20vVHJ1
+c3RBc2lhVExTUlNBUm9vdENBMBMGA1UdIAQMMAowCAYGZ4EMAQIBMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8v
+Y3JsLnd0LnRydXN0YXNpYS5jb20vVHJ1c3RBc2lhVExTUlNBUm9vdENBLmNybDAd
+BgNVHQ4EFgQUYXUFThr1D8FgICDCKNmLs+LBfbQwDgYDVR0PAQH/BAQDAgGGMA0G
+CSqGSIb3DQEBDAUAA4ICAQCpIjcVXxHv5IjZr2h2+PLiKzm8CW0EoSftEvjLDMec
+Roc7okR/tz3WZ/NWS6YxURaE0Qbt0ZHLOtPisaACcpOCVeoLhHLfF54U2RQposA/
+NK8Gdu1vNHWHDpF9H2MiY+VBPKr+lctYcvV/MipWa7SsBkZEu/Srd5Gp5tU4G7L0
+a/X7xcv/lwjbdvARe0Rz5tp1BEn0P/7exFqN3gkqujo5RvMoegi0EgsuM+ya5bCu
+vyfbp9Qzah+atfvzN+sYVaJjxnjogil7RRPNq+eR3nGocA+U0ypKl4ifpr+droZ9
+Fk7axJ7Fs3kkIxomcSINLFv0+m2IFOQvUWn5OBXkeP+NcEaVySJx/TTpHJ7U+Ill
+DzZZhAoqdxGb0Ac0SLmtGHnQVCs93aWIMcTNYqJtagE39kN+EcPAVb1znp8a7tw6
+D6kI1cKTLBHMyDBtUAZVmboDacJmQodTQ+tFbIMCRzrP2M51CiXDK4L6W27C8b9V
+Upq9WlIFeTfIqtkAq1iHyjv0YdoReprIHD2r/9g5X4mbMmsOFyaMT+lwnT5S0StD
++eiMQauCYnfqf88qJwbT5xCgRbd01yVm/V448GS/5XCZNSer4dToOzGcRvjBJTft
+XbdVkfXe0MAP3xhbpoihEKPyorWPLWr/iWcVDq4o25yFTSe/WFa30ZwieLhMDign
+Gg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF/TCCBOWgAwIBAgIRALLcTDSTLXCc1L8LCZQBaVwwDQYJKoZIhvcNAQEMBQAw
+fjELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
+QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAG
+A1UEAxMZQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQTAeFw0yNTEwMDcwNjU3MDha
+Fw0yOTAxMTQwNjU3MDhaMFgxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFz
+aWEgVGVjaG5vbG9naWVzLCBJbmMuMSIwIAYDVQQDExlUcnVzdEFzaWEgVExTIFJT
+QSBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwxa4G2qk
+RHPl1k70uc9bC8HRmoH1Y7CPQ8G7CFoaeuEHdiYfj2lWvv42YNAMg82U6ufFLVwv
+BRYCngqoL+VgJlSW+JhAHayunXRnL1T7lGOY4yZKg8aVtglDUM0Nfd5EDmAST1s1
+vb+ZOG19bNriaHMf+TGlGRBzBSrDMhmF6jSq3UIeMI0/nrUeYdVvvQBycq0SP6qm
+SXPyhhWVDBBfUWTO/3e4yW2s5dWY8ZkubOPJRPm1QycITfZ+3kR5u7KMHNrTS2wu
+1sN4t0zVpOTa3IqODv8Pw6ZgJijPNr/6VwrsWz/pMBZ7xNvE1GSgMPvl/R1xkt0p
+j0FY3gCtOv09fBqosRfwTjR4WCXWhSHreR3Q3KvPYjywx5eL1tCf0/483sXj/DqD
+cIQhHQnCofy7KCFlU2B6kG2WOFv/8dd6W23TyXBJSrodOtBQ2jIgGeSLP+vVFiY3
+PPt1nrAHcLgUYHfc9g9cUgq8XW2NUQraxRjIm23csIOzf6NOeEyYJavyfi4gXoIV
+ptbYj6zlzTKGyPnk2oniOz6TxRNq/8f3GPxnte8YLFSrQNNsTe3FyLc4T2TElExP
+oM2upcYnJXUnbcbanI6wBZnVKBHFIdS4/MeWq0pkWWFrE/xLzJKmD6RRvw5YkNmC
+gzmmX7P6bpKzzTMOhajxKdOrWa3W297UK4ECAwEAAaOCAZowggGWMHUGCCsGAQUF
+BwEBBGkwZzA7BggrBgEFBQcwAoYvaHR0cDovL3RydXN0YXNpYS5yZXBvc2l0b3J5
+LmNlcnR1bS5wbC9jdG5jYS5jZXIwKAYIKwYBBQUHMAGGHGh0dHA6Ly9zdWJjYS5v
+Y3NwLWNlcnR1bS5jb20wHwYDVR0jBBgwFoAUCHbNywf/JPbFze27kLzihDdGdfcw
+EgYDVR0TAQH/BAgwBgEB/wIBAjBtBgNVHR8EZjBkMDKgMKAuhixodHRwOi8vY2Vy
+dHVtLWNybC53dC50cnVzdGFzaWEuY29tL2N0bmNhLmNybDAuoCygKoYoaHR0cDov
+L3RydXN0YXNpYS5jcmwuY2VydHVtLnBsL2N0bmNhLmNybDATBgNVHSUEDDAKBggr
+BgEFBQcDATAOBgNVHQ8BAf8EBAMCAQYwNQYDVR0gBC4wLDAIBgZngQwBAgEwCAYG
+Z4EMAQICMAcGBWeBDAEBMA0GCysGAQQBgttOAgEBMB0GA1UdDgQWBBS4B5F5XAb0
+Rv17WcpaJpGnRSv4UzANBgkqhkiG9w0BAQwFAAOCAQEAIf2vyzSuFzECCTH3LPB/
+bmUH1aXbVm8zVwxof+4tn8EsNYH8CgM2AHxRkXP5jOitqylySAuVIATJLYFmBQJO
+XMCgf9NbbuG8P1VgnUQuUhQMChp2zT946Y55xZVANGg4o2+orw4SpclSy/R7eayX
+Lccr++uqke9gJlX3FCpi4Sa8sg/kSfSv4p7tuwu4YAk+XPBew3jQc9wueAJwQ/Rz
+H4LtICrekL0QuNHb0BhPcn4qELBF6f+IrOBA2MKw1m0C9y6uO8K+xd1JMpG0/RYZ
+cGIH+rR5fBymQSNuD+F5I2PeXMPpigPcEdOi/NWZcCLncJLDrEU62T8hkif6MQ4F
+Dw==
+-----END CERTIFICATE-----

im-server.htysapp.com_nginx 3/im-server.htysapp.com_bundle.pem

@@ -0,0 +1,115 @@
+-----BEGIN CERTIFICATE-----
+MIIHITCCBQmgAwIBAgIUbEw16Oxm5tp0dQZvqlg5MhH8e5IwDQYJKoZIhvcNAQEL
+BQAwWzELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xJTAjBgNVBAMTHFRydXN0QXNpYSBEViBUTFMgUlNBIENBIDIwMjQw
+HhcNMjYwNjIyMDQwMDAwWhcNMjYwOTIwMDM1OTU5WjAgMR4wHAYDVQQDExVpbS1z
+ZXJ2ZXIuaHR5c2FwcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCy/WoeWYgMQ9LtdhKTQppb+kEQG/nK9cvQOzIxPCAYHImVVJa2KGzXnykowt4t
+C2/isQLva5MSPzVcrqJYMed3Vj9RS26LmoJYiU5TKj1qNdHRYuMmvBSLiIK3Ch0e
+TocD/3eRja8b2ojQZ4NZhvEuT7f5JTDI36MCt7bXZAfvWxE/CZdu7NYgKKnCabDj
+jYw8qEvurE6r2UOwLX2b/zIsfx059+1TlbU+t0WPOiEGpqRScetI8yUvdSU+y7Uk
+WppB7OyNZMbPqqFxAEY0P+JXt2uiSVQXLDuAOqJFHRbKrxPN43NSARY82uowl/4v
+L6HriPGeA87nw9+YHBA0Mp2BAgMBAAGjggMWMIIDEjAMBgNVHRMBAf8EAjAAMB8G
+A1UdIwQYMBaAFGF1BU4a9Q/BYCAgwijZi7PiwX20MIGXBggrBgEFBQcBAQSBijCB
+hzBDBggrBgEFBQcwAoY3aHR0cDovL2ljYS53dC50cnVzdGFzaWEuY29tL1RydXN0
+QXNpYURWVExTUlNBQ0EyMDI0LmNydDBABggrBgEFBQcwAYY0aHR0cDovL29jc3Au
+d3QudHJ1c3Rhc2lhLmNvbS9UcnVzdEFzaWFEVlRMU1JTQUNBMjAyNDAgBgNVHREE
+GTAXghVpbS1zZXJ2ZXIuaHR5c2FwcC5jb20wEwYDVR0gBAwwCjAIBgZngQwBAgEw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
+bC53dC50cnVzdGFzaWEuY29tL1RydXN0QXNpYURWVExTUlNBQ0EyMDI0LmNybDAd
+BgNVHQ4EFgQUdltCRbULLFkqwGyD8KGJllujctkwDgYDVR0PAQH/BAQDAgWgMIIB
+gAYKKwYBBAHWeQIEAgSCAXAEggFsAWoAdwAlt+/eoRMBk+2TB5dwqjIqJmIN41rI
+qnx1GX3gsangZQAAAZ7t5FoRAAAEAwBIMEYCIQDU7rsiBCJAOMq/zvgURwUO4y+t
+1KAkEFHBVYGXowZJPAIhAIWRui/EAGv8cu40jStpXU/qOsmAQgdkyi2fOPEDqo4/
+AHYA1219ENGn9XfCx+lf1wC/+YLJM1pl4dCzAXMXwMjFaXcAAAGe7eReugAABAMA
+RzBFAiB6NvHf1WyBUTdWWYK2mhz/e7QytNclFeWjU/5TWGENrgIhAPjCxM44Q9Qm
+JOFSXywANvMURq+977PfkKWyGd9AT2RmAHcAr2eIO1ewTt2Pptl+9i6o64EKx3Fg
+8CReVdYML+eFhzoAAAGe7eRf2AAABAMASDBGAiEAoMDPdK+J9TfEy/kHL6e+EQGB
+0AJsLTiMhxOUnZBLp9ACIQCg/fOEY0UVx8MaE27RptKl8lFc5pEXu2jv+gYRrOe6
+ozANBgkqhkiG9w0BAQsFAAOCAgEAeilUjDXR5iSFG3IDxF2R1WQ8Wc5YpPzVMg5X
+nIJY12HPGOIdEVV0Vx95E06etgs2Fw0ApGrtMkS/8ZZHAdwaZnulyQsrp9Cew5pR
+IZ2vqJKy6LymBdDZc0UdGxAbGZU5LlOobAEPyZ3nOOHSVsOnfAXRvgHuAyGZDNw8
+/GPWdxI3X4TO2V3kPS/huVoXYsGfi2YIKvNdB8QPYMRGFpKNzIuhhy545PMS5iO3
+txjp3yeu5xpiFUeTwYmOCQaQgby99RvohvNIFoBVV5GeESrOsyndcW4wIh+C/bxQ
+gbG4uTLDnGLso0Ds+mCCZcFt8hmygAPZBmjDLQufjfOmvtNjFbeZ1+t2OfeNX8OF
+d3o80JiEzc7/nM7v4LAKmjktjYu2uh18VJczCLzFUzBWTEExM7hAlKVpjYYNK3SA
+Cvi5xM7T356+h8tUCECtW7BFnGe3YvI2m3S/3rX8EaiUmDpAQdIUJeszEDnIpkB4
+qHeexhE97AaoPn5FnsEtduvnfMO4aIMF0WQ6TxOp0Lfo2UDzjJaTqZouc+wRq59x
+gOzTS33g+Emm3vV8tXAHUmTAuc9rEayZP/Uo65m6N9QmbWRBrC9w05DV4rET2ilS
+XIKcuTCs1+C2/9cli2cfslf8uXlo5rs5U4N9AFwDs46xTnCWBKTdm0rmx/L+Za8l
+CQtbyB0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGvTCCBKWgAwIBAgIUHJ5rQS3rCoVGHeA9vjCYTQVziIswDQYJKoZIhvcNAQEM
+BQAwWDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcN
+MjQwNTE1MDYxOTE1WhcNMzQwNTE1MDYxOTE0WjBbMQswCQYDVQQGEwJDTjElMCMG
+A1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjElMCMGA1UEAxMcVHJ1
+c3RBc2lhIERWIFRMUyBSU0EgQ0EgMjAyNDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAK2GCKULRuSjgEhVn7j0cnfuSmrxS5/5H77qmOJwWJkMVE+SgBQn
+4mkoxVwF03E517T5YZZumwy5iCxktdnKp5Uq0C7td8yYnZgLb18pUeuzfkJBNWvI
+MccfeGCI6qdnl1nGv15loYjP0TEt7C9VyVrK+zmeTxdkBb5xP/hQPFVRWQROnruX
+gs7G1jbEX3Hhih+OR1dxcQkk7yVM493zuDVBBlNqH4KA/FawaGNcA/KRKHI0cqyT
+Q/GjthO3yyivTlu07/QGV5VTl2oor9ntyXdCmEktu0aKH3kOLRjBE5CiT55Gts7d
+1MBRwI3pAjLtDia4+Sz0XmPB/mH1/KO7EKtg+5XVZe3amDpboawWAS2oaKuDKWx/
+fh5AA0ViSS+8nDAbrxE4b/gPno28GZSG41VELtSxZvgA0T8lc1oBBywQc0BWfCC9
+PoSl2xSxhjKjJfY+od+EALfmEnEH3A53iK4z4gqpBo8O29omZ8HYxO9Tb5aemgla
+gP+8oWmxv6aZwYOpWHb3AqOxEoTMV0VwzfEqLsMGcP6koLCB51uPGu8kDF8PIpbu
+jallH/6K9QySf3S2H4SCme94tAjznz58En48PGoQPCSTDM6CyeEZqR3tEAnUF1gS
+4T+hkEiskHWLQ6QosxoFX2+qMMeQNHictf5O/ZPXvIv34yxE5kiiBWN3AgMBAAGj
+ggF6MIIBdjASBgNVHRMBAf8ECDAGAQH/AgEAMB8GA1UdIwQYMBaAFLgHkXlcBvRG
+/XtZylomkadFK/hTMIGTBggrBgEFBQcBAQSBhjCBgzBBBggrBgEFBQcwAoY1aHR0
+cDovL2ljYS53dC50cnVzdGFzaWEuY29tL1RydXN0QXNpYVRMU1JTQVJvb3RDQS5j
+cnQwPgYIKwYBBQUHMAGGMmh0dHA6Ly9vY3NwLnd0LnRydXN0YXNpYS5jb20vVHJ1
+c3RBc2lhVExTUlNBUm9vdENBMBMGA1UdIAQMMAowCAYGZ4EMAQIBMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8v
+Y3JsLnd0LnRydXN0YXNpYS5jb20vVHJ1c3RBc2lhVExTUlNBUm9vdENBLmNybDAd
+BgNVHQ4EFgQUYXUFThr1D8FgICDCKNmLs+LBfbQwDgYDVR0PAQH/BAQDAgGGMA0G
+CSqGSIb3DQEBDAUAA4ICAQCpIjcVXxHv5IjZr2h2+PLiKzm8CW0EoSftEvjLDMec
+Roc7okR/tz3WZ/NWS6YxURaE0Qbt0ZHLOtPisaACcpOCVeoLhHLfF54U2RQposA/
+NK8Gdu1vNHWHDpF9H2MiY+VBPKr+lctYcvV/MipWa7SsBkZEu/Srd5Gp5tU4G7L0
+a/X7xcv/lwjbdvARe0Rz5tp1BEn0P/7exFqN3gkqujo5RvMoegi0EgsuM+ya5bCu
+vyfbp9Qzah+atfvzN+sYVaJjxnjogil7RRPNq+eR3nGocA+U0ypKl4ifpr+droZ9
+Fk7axJ7Fs3kkIxomcSINLFv0+m2IFOQvUWn5OBXkeP+NcEaVySJx/TTpHJ7U+Ill
+DzZZhAoqdxGb0Ac0SLmtGHnQVCs93aWIMcTNYqJtagE39kN+EcPAVb1znp8a7tw6
+D6kI1cKTLBHMyDBtUAZVmboDacJmQodTQ+tFbIMCRzrP2M51CiXDK4L6W27C8b9V
+Upq9WlIFeTfIqtkAq1iHyjv0YdoReprIHD2r/9g5X4mbMmsOFyaMT+lwnT5S0StD
++eiMQauCYnfqf88qJwbT5xCgRbd01yVm/V448GS/5XCZNSer4dToOzGcRvjBJTft
+XbdVkfXe0MAP3xhbpoihEKPyorWPLWr/iWcVDq4o25yFTSe/WFa30ZwieLhMDign
+Gg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF/TCCBOWgAwIBAgIRALLcTDSTLXCc1L8LCZQBaVwwDQYJKoZIhvcNAQEMBQAw
+fjELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
+QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEiMCAG
+A1UEAxMZQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQTAeFw0yNTEwMDcwNjU3MDha
+Fw0yOTAxMTQwNjU3MDhaMFgxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFz
+aWEgVGVjaG5vbG9naWVzLCBJbmMuMSIwIAYDVQQDExlUcnVzdEFzaWEgVExTIFJT
+QSBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwxa4G2qk
+RHPl1k70uc9bC8HRmoH1Y7CPQ8G7CFoaeuEHdiYfj2lWvv42YNAMg82U6ufFLVwv
+BRYCngqoL+VgJlSW+JhAHayunXRnL1T7lGOY4yZKg8aVtglDUM0Nfd5EDmAST1s1
+vb+ZOG19bNriaHMf+TGlGRBzBSrDMhmF6jSq3UIeMI0/nrUeYdVvvQBycq0SP6qm
+SXPyhhWVDBBfUWTO/3e4yW2s5dWY8ZkubOPJRPm1QycITfZ+3kR5u7KMHNrTS2wu
+1sN4t0zVpOTa3IqODv8Pw6ZgJijPNr/6VwrsWz/pMBZ7xNvE1GSgMPvl/R1xkt0p
+j0FY3gCtOv09fBqosRfwTjR4WCXWhSHreR3Q3KvPYjywx5eL1tCf0/483sXj/DqD
+cIQhHQnCofy7KCFlU2B6kG2WOFv/8dd6W23TyXBJSrodOtBQ2jIgGeSLP+vVFiY3
+PPt1nrAHcLgUYHfc9g9cUgq8XW2NUQraxRjIm23csIOzf6NOeEyYJavyfi4gXoIV
+ptbYj6zlzTKGyPnk2oniOz6TxRNq/8f3GPxnte8YLFSrQNNsTe3FyLc4T2TElExP
+oM2upcYnJXUnbcbanI6wBZnVKBHFIdS4/MeWq0pkWWFrE/xLzJKmD6RRvw5YkNmC
+gzmmX7P6bpKzzTMOhajxKdOrWa3W297UK4ECAwEAAaOCAZowggGWMHUGCCsGAQUF
+BwEBBGkwZzA7BggrBgEFBQcwAoYvaHR0cDovL3RydXN0YXNpYS5yZXBvc2l0b3J5
+LmNlcnR1bS5wbC9jdG5jYS5jZXIwKAYIKwYBBQUHMAGGHGh0dHA6Ly9zdWJjYS5v
+Y3NwLWNlcnR1bS5jb20wHwYDVR0jBBgwFoAUCHbNywf/JPbFze27kLzihDdGdfcw
+EgYDVR0TAQH/BAgwBgEB/wIBAjBtBgNVHR8EZjBkMDKgMKAuhixodHRwOi8vY2Vy
+dHVtLWNybC53dC50cnVzdGFzaWEuY29tL2N0bmNhLmNybDAuoCygKoYoaHR0cDov
+L3RydXN0YXNpYS5jcmwuY2VydHVtLnBsL2N0bmNhLmNybDATBgNVHSUEDDAKBggr
+BgEFBQcDATAOBgNVHQ8BAf8EBAMCAQYwNQYDVR0gBC4wLDAIBgZngQwBAgEwCAYG
+Z4EMAQICMAcGBWeBDAEBMA0GCysGAQQBgttOAgEBMB0GA1UdDgQWBBS4B5F5XAb0
+Rv17WcpaJpGnRSv4UzANBgkqhkiG9w0BAQwFAAOCAQEAIf2vyzSuFzECCTH3LPB/
+bmUH1aXbVm8zVwxof+4tn8EsNYH8CgM2AHxRkXP5jOitqylySAuVIATJLYFmBQJO
+XMCgf9NbbuG8P1VgnUQuUhQMChp2zT946Y55xZVANGg4o2+orw4SpclSy/R7eayX
+Lccr++uqke9gJlX3FCpi4Sa8sg/kSfSv4p7tuwu4YAk+XPBew3jQc9wueAJwQ/Rz
+H4LtICrekL0QuNHb0BhPcn4qELBF6f+IrOBA2MKw1m0C9y6uO8K+xd1JMpG0/RYZ
+cGIH+rR5fBymQSNuD+F5I2PeXMPpigPcEdOi/NWZcCLncJLDrEU62T8hkif6MQ4F
+Dw==
+-----END CERTIFICATE-----

src/chat-env.js

@@ -1,4 +1,4 @@
-const ENV = process.env.NODE_ENV === 'development' ? 'DEV' : 'PROD';
+const ENV = import.meta.env.DEV ? 'DEV' : 'PROD';
 
 const CHAT_ENV = {};
 
@@ -18,7 +18,12 @@ if (ENV == 'DEV') {
 // 生产
 if (ENV == 'PROD') {
   CHAT_ENV.BASE_URL = 'http://im-platform.htysapp.com';
-  CHAT_ENV.WS_URL = 'ws://im-server.htysapp.com/im';
+  CHAT_ENV.WS_URL = 'wss://im-server.htysapp.com/im';
+  // #ifdef H5
+  CHAT_ENV.BASE_URL = '/im-platform-api';
+  // #endif
 }
 
+console.log("CHAT_ENV:", CHAT_ENV);
+
 export default CHAT_ENV;

src/pages/activity/groupon/detail.vue

@@ -1,37 +1,22 @@
 <!-- 拼团订单的详情 -->
 <template>
-  <s-layout
-    title="拼团详情"
-    class="detail-wrap"
-    :navbar="state.data && !state.loading ? 'inner' : 'normal'"
-    :onShareAppMessage="shareInfo"
-  >
+  <s-layout title="拼团详情" class="detail-wrap" :navbar="state.data && !state.loading ? 'inner' : 'normal'"
+    :onShareAppMessage="shareInfo">
     <view v-if="state.loading"></view>
     <view v-if="state.data && !state.loading">
       <!-- 团长信息 + 活动信息 -->
-      <view
-        class="recharge-box"
-        v-if="state.data.headRecord"
-        :style="[
-          {
-            marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
-            paddingTop: Number(statusBarHeight + 108) + 'rpx',
-          },
-        ]"
-      >
-        <s-goods-item
-          class="goods-box"
-          :img="state.data.headRecord.picUrl"
-          :title="state.data.headRecord.spuName"
-          :price="state.data.headRecord.combinationPrice"
-          priceColor="#E1212B"
-          @tap="
+      <view class="recharge-box" v-if="state.data.headRecord" :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+          paddingTop: Number(statusBarHeight + 108) + 'rpx',
+        },
+      ]">
+        <s-goods-item class="goods-box" :img="state.data.headRecord.picUrl" :title="state.data.headRecord.spuName"
+          :price="state.data.headRecord.combinationPrice" priceColor="#E1212B" @tap="
             sheep.$router.go('/pages/goods/groupon', {
               id: state.data.headRecord.activityId,
             })
-          "
-          :style="[{ top: Number(statusBarHeight + 108) + 'rpx' }]"
-        >
+            " :style="[{ top: Number(statusBarHeight + 108) + 'rpx' }]">
           <template #groupon>
             <view class="ss-flex">
               <view class="sales-title">{{ state.data.headRecord.userSize }}人团</view>
@@ -76,9 +61,7 @@
           </view>
           <view class="countdown-title ss-flex" v-else>
             还差
-            <view class="num"
-              >{{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人</view
-            >
+            <view class="num">{{ state.data.headRecord.userSize - state.data.headRecord.userCount }}人</view>
             拼团成功
             <view class="ss-flex countdown-time">
               <view class="countdown-h ss-flex ss-row-center">{{ endTime.h }}</view>
@@ -98,47 +81,30 @@
         <view class="ss-m-t-60 ss-flex ss-flex-wrap ss-row-center">
           <!-- 团长 -->
           <view class="header-avatar ss-m-r-24 ss-m-b-20">
-            <image :src="sheep.$url.cdn(state.data.headRecord.avatar) || sheep.$url.static('/static/img/shop/default_avatar.png')" class="avatar-img"></image>
+            <image
+              :src="sheep.$url.cdn(state.data.headRecord.avatar) || sheep.$url.static('/static/img/shop/default_avatar.png')"
+              class="avatar-img"></image>
             <view class="header-tag ss-flex ss-col-center ss-row-center">团长</view>
           </view>
           <!-- 团员 -->
-          <view
-            class="header-avatar ss-m-r-24 ss-m-b-20"
-            v-for="item in state.data.memberRecords"
-            :key="item.id"
-          >
-            <image :src="sheep.$url.cdn(item.avatar) || sheep.$url.static('/static/img/shop/default_avatar.png')" class="avatar-img"></image>
-            <view
-              class="header-tag ss-flex ss-col-center ss-row-center"
-              v-if="item.is_leader == '1'"
-            >
+          <view class="header-avatar ss-m-r-24 ss-m-b-20" v-for="item in state.data.memberRecords" :key="item.id">
+            <image :src="sheep.$url.cdn(item.avatar) || sheep.$url.static('/static/img/shop/default_avatar.png')"
+              class="avatar-img"></image>
+            <view class="header-tag ss-flex ss-col-center ss-row-center" v-if="item.is_leader == '1'">
               团长
             </view>
           </view>
           <!-- 还有几个坑位 -->
-          <view
-            class="default-avatar ss-m-r-24 ss-m-b-20"
-            v-for="item in state.remainNumber"
-            :key="item"
-          >
-            <image
-              :src="sheep.$url.static('/static/img/shop/avatar/unknown.png')"
-              class="avatar-img"
-            ></image>
+          <view class="default-avatar ss-m-r-24 ss-m-b-20" v-for="item in state.remainNumber" :key="item">
+            <image :src="sheep.$url.static('/static/img/shop/avatar/unknown.png')" class="avatar-img"></image>
           </view>
         </view>
       </view>
 
       <!-- 情况一：拼团成功；情况二：拼团失败 -->
-      <view
-        v-if="state.data.headRecord.status === 1 || state.data.headRecord.status === 2"
-        class="ss-m-t-40 ss-flex ss-row-center"
-      >
-        <button
-          class="ss-reset-button order-btn"
-          v-if="state.data.orderId"
-          @tap="onDetail(state.data.orderId)"
-        >
+      <view v-if="state.data.headRecord.status === 1 || state.data.headRecord.status === 2"
+        class="ss-m-t-40 ss-flex ss-row-center">
+        <button class="ss-reset-button order-btn" v-if="state.data.orderId" @tap="onDetail(state.data.orderId)">
           查看订单
         </button>
         <button class="ss-reset-button join-btn" v-else @tap="onCreateGroupon"> 我要开团 </button>
@@ -147,19 +113,10 @@
       <!-- 情况三：拼团进行中，查看订单或参加或邀请好友或参加 -->
       <view v-if="state.data.headRecord.status === 0" class="ss-m-t-40 ss-flex ss-row-center">
         <view v-if="state.data.headRecord.expireTime <= new Date().getTime()">
-          <button
-            class="ss-reset-button join-btn"
-            v-if="state.data.orderId"
-            @tap="onDetail(state.data.orderId)"
-          >
+          <button class="ss-reset-button join-btn" v-if="state.data.orderId" @tap="onDetail(state.data.orderId)">
             查看订单
           </button>
-          <button
-            class="ss-reset-button disabled-btn"
-            v-else
-            disabled
-            @tap="onDetail(state.data.orderId)"
-          >
+          <button class="ss-reset-button disabled-btn" v-else disabled @tap="onDetail(state.data.orderId)">
             去参团
           </button>
         </view>
@@ -170,11 +127,7 @@
             </button>
           </view>
           <view v-else>
-            <button
-              class="ss-reset-button join-btn"
-              :disabled="endTime.ms <= 0"
-              @tap="onJoinGroupon()"
-            >
+            <button class="ss-reset-button join-btn" :disabled="endTime.ms <= 0" @tap="onJoinGroupon()">
               立即参团
             </button>
           </view>
@@ -183,15 +136,9 @@
 
       <view v-if="!isEmpty(state.goodsInfo)">
         <!-- 规格与数量弹框 -->
-        <s-select-groupon-sku
-          :show="state.showSelectSku"
-          :goodsInfo="state.goodsInfo"
-          :grouponAction="state.grouponAction"
-          :grouponNum="state.grouponNum"
-          @buy="onBuy"
-          @change="onSkuChange"
-          @close="state.showSelectSku = false"
-        />
+        <s-select-groupon-sku :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
+          :grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy" @change="onSkuChange"
+          @close="state.showSelectSku = false" />
       </view>
     </view>
 
@@ -200,340 +147,345 @@
 </template>
 
 <script setup>
-  import { computed, reactive } from 'vue';
-  import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
-  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
-  import { showShareModal } from '@/sheep/hooks/useModal';
-  import { isEmpty } from 'lodash-es';
-  import CombinationApi from '@/sheep/api/promotion/combination';
-  import SpuApi from '@/sheep/api/product/spu';
-  import { SharePageEnum } from '@/sheep/helper/const';
+import { computed, reactive } from 'vue';
+import sheep from '@/sheep';
+import { onLoad } from '@dcloudio/uni-app';
+import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+import { showShareModal } from '@/sheep/hooks/useModal';
+import { isEmpty } from 'lodash-es';
+import CombinationApi from '@/sheep/api/promotion/combination';
+import SpuApi from '@/sheep/api/product/spu';
+import { SharePageEnum } from '@/sheep/helper/const';
 
-  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const state = reactive({
-    data: {}, // 拼团详情
-    goodsId: 0, // 商品ID
-    goodsInfo: {}, // 商品信息
-    showSelectSku: false, // 显示规格弹框
-    selectedSkuPrice: {}, // 选中的规格价格
-    activity: {}, // 团购活动
-    grouponId: 0, // 团购ID
-    grouponNum: 0, // 团购人数
-    grouponAction: 'create', // 团购操作
-    combinationHeadId: null, // 拼团团长编号
-    loading: true,
+const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+const state = reactive({
+  data: {}, // 拼团详情
+  goodsId: 0, // 商品ID
+  goodsInfo: {}, // 商品信息
+  showSelectSku: false, // 显示规格弹框
+  selectedSkuPrice: {}, // 选中的规格价格
+  activity: {}, // 团购活动
+  grouponId: 0, // 团购ID
+  grouponNum: 0, // 团购人数
+  grouponAction: 'create', // 团购操作
+  combinationHeadId: null, // 拼团团长编号
+  loading: true,
+});
+
+const shareInfo = computed(() => {
+  if (isEmpty(state.data)) return {};
+  return sheep.$platform.share.getShareInfo(
+    {
+      title: state.data.headRecord.spuName,
+      image: sheep.$url.cdn(state.data.headRecord.picUrl),
+      desc: state.data.goods?.subtitle,
+      params: {
+        page: SharePageEnum.GROUPON_DETAIL.value,
+        query: state.data.headRecord.id,
+      },
+    },
+    {
+      type: 'groupon', // 邀请拼团海报
+      title: state.data.headRecord.spuName, // 商品标题
+      image: sheep.$url.cdn(state.data.headRecord.picUrl), // 商品主图
+      price: fen2yuan(state.data.headRecord.combinationPrice), // 商品价格
+      grouponNum: state.data.headRecord.userSize, // 拼团人数
+    },
+  );
+});
+
+// 订单详情
+function onDetail(orderId) {
+  sheep.$router.go('/pages/order/detail', {
+    id: orderId,
   });
+}
 
-  const shareInfo = computed(() => {
-    if (isEmpty(state.data)) return {};
-    return sheep.$platform.share.getShareInfo(
-      {
-        title: state.data.headRecord.spuName,
-        image: sheep.$url.cdn(state.data.headRecord.picUrl),
-        desc: state.data.goods?.subtitle,
-        params: {
-          page: SharePageEnum.GROUPON_DETAIL.value,
-          query: state.data.headRecord.id,
+// 去开团
+function onCreateGroupon() {
+  state.grouponAction = 'create';
+  state.grouponId = 0;
+  state.showSelectSku = true;
+}
+
+// 规格变更
+function onSkuChange(e) {
+  state.selectedSkuPrice = e;
+}
+
+// 立即参团
+function onJoinGroupon() {
+  state.grouponAction = 'join';
+  state.grouponId = state.data.headRecord.activityId;
+  state.combinationHeadId = state.data.headRecord.id;
+  state.grouponNum = state.data.headRecord.userSize;
+  state.showSelectSku = true;
+}
+
+// 立即购买
+function onBuy(sku) {
+  sheep.$router.go('/pages/order/confirm', {
+    data: JSON.stringify({
+      order_type: 'goods',
+      combinationActivityId: state.activity.id,
+      combinationHeadId: state.combinationHeadId,
+      items: [
+        {
+          skuId: sku.id,
+          count: sku.count,
         },
-      },
-      {
-        type: 'groupon', // 邀请拼团海报
-        title: state.data.headRecord.spuName, // 商品标题
-        image: sheep.$url.cdn(state.data.headRecord.picUrl), // 商品主图
-        price: fen2yuan(state.data.headRecord.combinationPrice), // 商品价格
-        grouponNum: state.data.headRecord.userSize, // 拼团人数
-      },
+      ],
+    }),
+  });
+}
+
+const endTime = computed(() => {
+  return useDurationTime(state.data.headRecord.expireTime);
+});
+
+// 获取拼团团队详情
+async function getGrouponDetail(id) {
+  const { code, data } = await CombinationApi.getCombinationRecordDetail(id);
+  if (code === 0) {
+    state.data = data;
+    const remainNumber = Number(state.data.headRecord.userSize - state.data.headRecord.userCount);
+    state.remainNumber = remainNumber > 0 ? remainNumber : 0;
+
+    // 获取活动信息
+    const { data: activity } = await CombinationApi.getCombinationActivity(
+      data.headRecord.activityId,
     );
-  });
-
-  // 订单详情
-  function onDetail(orderId) {
-    sheep.$router.go('/pages/order/detail', {
-      id: orderId,
+    state.activity = activity;
+    state.grouponNum = activity.userSize;
+    // 加载商品信息
+    const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
+    state.goodsId = spu.id;
+    // 默认显示最低价
+    activity.products.forEach((product) => {
+      spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
     });
-  }
-
-  // 去开团
-  function onCreateGroupon() {
-    state.grouponAction = 'create';
-    state.grouponId = 0;
-    state.showSelectSku = true;
-  }
-
-  // 规格变更
-  function onSkuChange(e) {
-    state.selectedSkuPrice = e;
-  }
-
-  // 立即参团
-  function onJoinGroupon() {
-    state.grouponAction = 'join';
-    state.grouponId = state.data.headRecord.activityId;
-    state.combinationHeadId = state.data.headRecord.id;
-    state.grouponNum = state.data.headRecord.userSize;
-    state.showSelectSku = true;
-  }
-
-  // 立即购买
-  function onBuy(sku) {
-    sheep.$router.go('/pages/order/confirm', {
-      data: JSON.stringify({
-        order_type: 'goods',
-        combinationActivityId: state.activity.id,
-        combinationHeadId: state.combinationHeadId,
-        items: [
-          {
-            skuId: sku.id,
-            count: sku.count,
-          },
-        ],
-      }),
+    state.goodsInfo = spu;
+    // 价格、库存使用活动的
+    spu.skus.forEach((sku) => {
+      const product = activity.products.find((product) => product.skuId === sku.id);
+      if (product) {
+        sku.price = product.combinationPrice;
+      } else {
+        // 找不到可能是没配置，则不能发起秒杀
+        sku.stock = 0;
+      }
     });
+  } else {
+    state.data = null;
   }
+  state.loading = false;
+}
 
-  const endTime = computed(() => {
-    return useDurationTime(state.data.headRecord.expireTime);
-  });
+function onShare() {
+  showShareModal();
+}
 
-  // 获取拼团团队详情
-  async function getGrouponDetail(id) {
-    const { code, data } = await CombinationApi.getCombinationRecordDetail(id);
-    if (code === 0) {
-      state.data = data;
-      const remainNumber = Number(state.data.headRecord.userSize - state.data.headRecord.userCount);
-      state.remainNumber = remainNumber > 0 ? remainNumber : 0;
-
-      // 获取活动信息
-      const { data: activity } = await CombinationApi.getCombinationActivity(
-        data.headRecord.activityId,
-      );
-      state.activity = activity;
-      state.grouponNum = activity.userSize;
-      // 加载商品信息
-      const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
-      state.goodsId = spu.id;
-      // 默认显示最低价
-      activity.products.forEach((product) => {
-        spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
-      });
-      state.goodsInfo = spu;
-      // 价格、库存使用活动的
-      spu.skus.forEach((sku) => {
-        const product = activity.products.find((product) => product.skuId === sku.id);
-        if (product) {
-          sku.price = product.combinationPrice;
-        } else {
-          // 找不到可能是没配置，则不能发起秒杀
-          sku.stock = 0;
-        }
-      });
-    } else {
-      state.data = null;
-    }
-    state.loading = false;
-  }
-
-  function onShare() {
-    showShareModal();
-  }
-
-  onLoad((options) => {
-    getGrouponDetail(options.id);
-  });
+onLoad((options) => {
+  getGrouponDetail(options.id);
+});
 </script>
 
 <style lang="scss" scoped>
-  .recharge-box {
-    position: relative;
-    margin-bottom: 120rpx;
-    background: v-bind(headerBg) center/750rpx 100% no-repeat,
-      linear-gradient(115deg, #f44739 0%, #ff6600 100%);
-    border-radius: 0 0 5% 5%;
-    height: 100rpx;
+.recharge-box {
+  position: relative;
+  margin-bottom: 120rpx;
+  background: v-bind(headerBg) center/750rpx 100% no-repeat,
+    linear-gradient(115deg, #f44739 0%, #ff6600 100%);
+  border-radius: 0 0 5% 5%;
+  height: 100rpx;
 
-    .goods-box {
-      width: 710rpx;
-      border-radius: 20rpx;
-      position: absolute;
-      left: 20rpx;
-      box-sizing: border-box;
-    }
-
-    .sales-title {
-      height: 32rpx;
-      background: rgba(#ffe0e2, 0.29);
-      border-radius: 16rpx;
-      font-size: 24rpx;
-      font-weight: 400;
-      padding: 6rpx 20rpx;
-      color: #f7979c;
-    }
-
-    .num-title {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
-  }
-
-  .countdown-time {
-    font-size: 26rpx;
-    font-weight: 500;
-    color: #383a46;
-    .countdown-h {
-      font-size: 24rpx;
-      font-family: OPPOSANS;
-      font-weight: 500;
-      color: #ffffff;
-      padding: 0 4rpx;
-      margin-left: 16rpx;
-      height: 40rpx;
-      background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
-      border-radius: 6rpx;
-    }
-    .countdown-num {
-      font-size: 24rpx;
-      font-family: OPPOSANS;
-      font-weight: 500;
-      color: #ffffff;
-      width: 40rpx;
-      height: 40rpx;
-      background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
-      border-radius: 6rpx;
-    }
-  }
-
-  .countdown-box {
-    // height: 364rpx;
-    background: #ffffff;
-    border-radius: 10rpx;
+  .goods-box {
+    width: 710rpx;
+    border-radius: 20rpx;
+    position: absolute;
+    left: 20rpx;
     box-sizing: border-box;
-
-    .countdown-title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #333333;
-
-      .cicon-check-round {
-        color: #42b111;
-        margin-right: 24rpx;
-      }
-
-      .cicon-info {
-        color: #d71e08;
-        margin-right: 24rpx;
-      }
-
-      .num {
-        color: #ff6000;
-      }
-    }
-
-    .header-avatar {
-      width: 86rpx;
-      height: 86rpx;
-      background: #ececec;
-      border-radius: 50%;
-      border: 4rpx solid #edc36c;
-      position: relative;
-      box-sizing: border-box;
-
-      .avatar-img {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-      }
-
-      .header-tag {
-        width: 72rpx;
-        height: 36rpx;
-        font-size: 24rpx;
-        line-height: nor;
-        background: linear-gradient(132deg, #f3dfb1, #f3dfb1, #ecbe60);
-        border-radius: 16rpx;
-        position: absolute;
-        left: 4rpx;
-        top: -36rpx;
-      }
-    }
-    .default-avatar {
-      width: 86rpx;
-      height: 86rpx;
-      background: #ececec;
-      border-radius: 50%;
-      .avatar-img {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-      }
-    }
-
-    .user-avatar {
-      width: 86rpx;
-      height: 86rpx;
-      background: #ececec;
-      border-radius: 50%;
-    }
   }
-  .order-btn {
-    width: 668rpx;
-    height: 70rpx;
-    border: 2rpx solid #dfdfdf;
-    border-radius: 35rpx;
+
+  .sales-title {
+    height: 32rpx;
+    background: rgba(#ffe0e2, 0.29);
+    border-radius: 16rpx;
+    font-size: 24rpx;
+    font-weight: 400;
+    padding: 6rpx 20rpx;
+    color: #f7979c;
+  }
+
+  .num-title {
+    font-size: 24rpx;
+    font-weight: 400;
     color: #999999;
-    font-weight: 500;
-    font-size: 26rpx;
-    line-height: normal;
   }
+}
 
-  .disabled-btn {
-    width: 668rpx;
-    height: 70rpx;
-    background: #dddddd;
-    border-radius: 35rpx;
-    color: #999999;
+.countdown-time {
+  font-size: 26rpx;
+  font-weight: 500;
+  color: #383a46;
+
+  .countdown-h {
+    font-size: 24rpx;
+    font-family: OPPOSANS;
     font-weight: 500;
-    font-size: 28rpx;
-    line-height: normal;
-  }
-
-  .join-btn {
-    width: 668rpx;
-    height: 70rpx;
+    color: #ffffff;
+    padding: 0 4rpx;
+    margin-left: 16rpx;
+    height: 40rpx;
     background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
-    box-shadow: 0px 8rpx 6rpx 0px rgba(255, 104, 4, 0.22);
-    border-radius: 35rpx;
-    color: #fff;
+    border-radius: 6rpx;
+  }
+
+  .countdown-num {
+    font-size: 24rpx;
+    font-family: OPPOSANS;
     font-weight: 500;
+    color: #ffffff;
+    width: 40rpx;
+    height: 40rpx;
+    background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
+    border-radius: 6rpx;
+  }
+}
+
+.countdown-box {
+  // height: 364rpx;
+  background: #ffffff;
+  border-radius: 10rpx;
+  box-sizing: border-box;
+
+  .countdown-title {
     font-size: 28rpx;
-    line-height: normal;
+    font-weight: 500;
+    color: #333333;
+
+    .cicon-check-round {
+      color: #42b111;
+      margin-right: 24rpx;
+    }
+
+    .cicon-info {
+      color: #d71e08;
+      margin-right: 24rpx;
+    }
+
+    .num {
+      color: #ff6000;
+    }
   }
 
-  .detail-cell-wrap {
-    width: 100%;
-    padding: 10rpx 20rpx;
+  .header-avatar {
+    width: 86rpx;
+    height: 86rpx;
+    background: #ececec;
+    border-radius: 50%;
+    border: 4rpx solid #edc36c;
+    position: relative;
     box-sizing: border-box;
-    border-top: 2rpx solid #dfdfdf;
-    background-color: #fff;
-    // min-height: 60rpx;
 
-    .label-text {
-      font-size: 28rpx;
-      font-weight: 400;
+    .avatar-img {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
     }
 
-    .cell-content {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: $dark-6;
-    }
-
-    .right-forwrad-icon {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: $dark-9;
+    .header-tag {
+      width: 72rpx;
+      height: 36rpx;
+      font-size: 24rpx;
+      line-height: nor;
+      background: linear-gradient(132deg, #f3dfb1, #f3dfb1, #ecbe60);
+      border-radius: 16rpx;
+      position: absolute;
+      left: 4rpx;
+      top: -36rpx;
     }
   }
+
+  .default-avatar {
+    width: 86rpx;
+    height: 86rpx;
+    background: #ececec;
+    border-radius: 50%;
+
+    .avatar-img {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+    }
+  }
+
+  .user-avatar {
+    width: 86rpx;
+    height: 86rpx;
+    background: #ececec;
+    border-radius: 50%;
+  }
+}
+
+.order-btn {
+  width: 668rpx;
+  height: 70rpx;
+  border: 2rpx solid #dfdfdf;
+  border-radius: 35rpx;
+  color: #999999;
+  font-weight: 500;
+  font-size: 26rpx;
+  line-height: normal;
+}
+
+.disabled-btn {
+  width: 668rpx;
+  height: 70rpx;
+  background: #dddddd;
+  border-radius: 35rpx;
+  color: #999999;
+  font-weight: 500;
+  font-size: 28rpx;
+  line-height: normal;
+}
+
+.join-btn {
+  width: 668rpx;
+  height: 70rpx;
+  background: linear-gradient(90deg, #ff6000 0%, #fe832a 100%);
+  box-shadow: 0px 8rpx 6rpx 0px rgba(255, 104, 4, 0.22);
+  border-radius: 35rpx;
+  color: #fff;
+  font-weight: 500;
+  font-size: 28rpx;
+  line-height: normal;
+}
+
+.detail-cell-wrap {
+  width: 100%;
+  padding: 10rpx 20rpx;
+  box-sizing: border-box;
+  border-top: 2rpx solid #dfdfdf;
+  background-color: #fff;
+  // min-height: 60rpx;
+
+  .label-text {
+    font-size: 28rpx;
+    font-weight: 400;
+  }
+
+  .cell-content {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: $dark-6;
+  }
+
+  .right-forwrad-icon {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: $dark-9;
+  }
+}
 </style>

src/pages/profile/apply-vip.vue

@@ -140,6 +140,7 @@ import PayOrderApi from '@/sheep/api/pay/order';
 // @ts-ignore
 import sheep from '@/sheep';
 import { jumpToWechatMiniProgram, wechatNavBack } from '@/sheep/util/wechat-tool';
+import appConfig from '@/sheep/config';
 
 const messageBox = useMessage();
 const vipProtocolMessageBox = useMessage('vip-protocol-message-box');
@@ -277,16 +278,24 @@ const handleOpenVip = () => {
       msg: `确认使用${payMethodItem.title}${fen2yuan(currentOpenType.value?.preferentialPrice)}元,开通${currentOpenType.value?.title}会员吗?`,
     })
     .then(async () => {
-      // #ifdef MP-WEIXIN
-      if (payMethod.value === 'wechat') {
-        disposeWechatPay(curOpenTypeId.value);
+      if (appConfig.buildTarget === 'H5') {
+        if (payMethod.value === 'wechat') {
+          disposeWechatPay(curOpenTypeId.value);
+        } else {
+          disposeAlipayPay(curOpenTypeId.value);
+        }
       } else {
-        disposeAlipayPay(curOpenTypeId.value);
+        // #ifdef MP-WEIXIN
+        if (payMethod.value === 'wechat') {
+          disposeWechatPay(curOpenTypeId.value);
+        } else {
+          disposeAlipayPay(curOpenTypeId.value);
+        }
+        // #endif
+        // #ifndef MP-WEIXIN
+        jumpToWechatPage();
+        // #endif   
       }
-      // #endif
-      // #ifndef MP-WEIXIN
-      jumpToWechatPage();
-      // #endif
     })
     .catch(() => { });
 };

src/sheep/config/index.js

@@ -11,8 +11,6 @@ if (process.env.NODE_ENV === 'development') {
 }
 if (typeof baseUrl === 'undefined') {
   console.error('请检查.env配置文件是否存在');
-} else {
-  console.log(`[芋道商城 ${version}]  https://doc.iocoder.cn`);
 }
 
 export const apiPath = import.meta.env.SHOPRO_API_PATH;
@@ -20,8 +18,10 @@ export const staticUrl = import.meta.env.SHOPRO_STATIC_URL;
 export const tenantId = import.meta.env.SHOPRO_TENANT_ID;
 export const websocketPath = import.meta.env.SHOPRO_WEBSOCKET_PATH;
 export const h5Url = import.meta.env.SHOPRO_H5_URL;
+export const buildTarget = import.meta.env.SHOPRO_BUILD_TARGET;
 
 export default {
+  buildTarget,
   baseUrl,
   apiPath,
   staticUrl,

src/sheep/platform/pay.js

@@ -148,7 +148,7 @@ export default class SheepPay {
 
   // 浏览器微信 H5 支付 TODO 芋艿：待接入（注意：H5 支付是给普通浏览器，不是微信公众号的支付，绝大多数人用不到，可以忽略）
   async wechatWapPay() {
-    const { error, data } = await this.prepay();
+    const { error, data } = await this.prepay('wx_wap');
     if (error === 0) {
       const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment
         }&orderType=${this.orderType}`;

vite.config.ts

@@ -9,12 +9,29 @@ import uniReadPagesV3Plugin from './src/sheep/router/utils/uni-read-pages-v3';
 export default async (command: 'build' | 'serve', mode: string) => {
   const env = loadEnv(mode, __dirname, 'SHOPRO_');
   const { default: Unocss } = await import('unocss/vite');
+  const isBuild = command === 'build';
+  const nodeEnv = mode === 'production' ? 'production' : 'development';
+  const browserProcessEnv = {
+    NODE_ENV: nodeEnv,
+    UNI_APP_X: process.env.UNI_APP_X ?? '',
+  };
+  const browserProcess = JSON.stringify({
+    env: {
+      ...browserProcessEnv,
+    },
+  });
 
   const isH5 = process.env.UNI_PLATFORM === 'h5';
 
   if (isH5) {
     return {
       envPrefix: 'SHOPRO_',
+      define: {
+        process: browserProcess,
+        'process.env': JSON.stringify(browserProcessEnv),
+        'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+        'process.env.UNI_APP_X': JSON.stringify(process.env.UNI_APP_X ?? ''),
+      },
       plugins: [
         uni(),
         Unocss(),
@@ -26,6 +43,9 @@ export default async (command: 'build' | 'serve', mode: string) => {
           includes: ['path', 'aliasPath', 'name', 'meta'],
         }),
       ],
+      esbuild: {
+        drop: isBuild ? ['console', 'debugger'] : [],
+      },
       server: {
         host: true,
         hmr: {
@@ -61,6 +81,12 @@ export default async (command: 'build' | 'serve', mode: string) => {
   } else {
     return {
       envPrefix: 'SHOPRO_',
+      define: {
+        process: browserProcess,
+        'process.env': JSON.stringify(browserProcessEnv),
+        'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+        'process.env.UNI_APP_X': JSON.stringify(process.env.UNI_APP_X ?? ''),
+      },
       plugins: [
         uni(),
         Unocss(),
@@ -73,6 +99,7 @@ export default async (command: 'build' | 'serve', mode: string) => {
         }),
       ],
       esbuild: {
+        drop: isBuild ? ['console', 'debugger'] : [],
         target: 'es2015',
         supported: {
           'optional-chain': false,