diff --git a/.gitignore b/.gitignore
index f66ec21..668948d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ node_modules/
.claude/settings.local.json
.hbuilderx/project.config.json
clean-cache.bat
+.hbuilderx/launch.json
diff --git a/App.vue b/App.vue
index 5d75b18..57e2c25 100755
--- a/App.vue
+++ b/App.vue
@@ -4,6 +4,7 @@ import { getPublicConfig } from '@/api/appUser'
export default {
onLaunch: function(options) {
console.log('App Launch', options)
+
try { uni.setStorageSync('app_session_id', String(Date.now())) } catch (_) {}
if (options && options.query && options.query.invite_code) {
console.log('App Launch captured invite_code:', options.query.invite_code)
diff --git a/api/appUser.js b/api/appUser.js
index ea6db15..bf547d4 100755
--- a/api/appUser.js
+++ b/api/appUser.js
@@ -224,6 +224,10 @@ export function createWechatOrder(data) {
return authRequest({ url: '/api/app/pay/wechat/jsapi/preorder', method: 'POST', data })
}
+export function createWechatAppOrder(data) {
+ return authRequest({ url: '/api/app/pay/wechat/app/preorder', method: 'POST', data })
+}
+
export function getLotteryResult(order_no) {
return authRequest({ url: '/api/app/lottery/result', method: 'GET', data: { order_no } })
}
diff --git a/components/PrivacyPopup.vue b/components/PrivacyPopup.vue
new file mode 100644
index 0000000..8a3669c
--- /dev/null
+++ b/components/PrivacyPopup.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
diff --git a/manifest.json b/manifest.json
index c8288a2..915d024 100755
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,9 @@
"delay" : 0
},
/* 模块配置 */
- "modules" : {},
+ "modules" : {
+ "Payment" : {}
+ },
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
@@ -37,7 +39,10 @@
"",
"",
"",
- ""
+ "",
+ "",
+ "",
+ ""
]
},
/* ios打包配置 */
@@ -45,7 +50,22 @@
"dSYMs" : false
},
/* SDK配置 */
- "sdkConfigs" : {}
+ "sdkConfigs" : {
+ "payment" : {
+ "weixin" : {
+ "__platform__" : ["android", "ios"],
+ "appid" : "wx26ad074017e1e63f",
+ "UniversalLinks" : ""
+ }
+ },
+ "share" : {},
+ "oauth" : {
+ "weixin" : {
+ "appid" : "wx26ad074017e1e63f",
+ "UniversalLinks" : ""
+ }
+ }
+ }
}
},
/* 快应用特有相关 */
diff --git a/pages-shop/shop/detail.vue b/pages-shop/shop/detail.vue
index 4fed724..a681ba5 100755
--- a/pages-shop/shop/detail.vue
+++ b/pages-shop/shop/detail.vue
@@ -5,7 +5,7 @@
商品库存不足,由于市场价格存在波动,请联系客服核实价格和补充库存
-
+
@@ -45,13 +45,15 @@