msb-mca
/
shop-app
2.1k
3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 3 years ago
parent 9762aaba80 3074df1620
commit 1ba5a49242
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File

9
common/store/index.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-22 18:28:52 * @Date: 2022-03-22 18:28:52
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-28 18:05:32 * @LastEditTime: 2022-04-28 18:43:18
* @Description: file content * @Description: file content
*/ */
import Vue from 'vue' import Vue from 'vue'
@ -15,7 +15,9 @@ const
// 用户信息 // 用户信息
USER_INFO = 'ui', USER_INFO = 'ui',
// 地址列表 // 地址列表
ADDRESS = 'ads'; ADDRESS = 'ads',
// oppenId
OPPED_ID = 'oi';
export default new Vuex.Store({ export default new Vuex.Store({
state : { state : {
@ -24,7 +26,7 @@ export default new Vuex.Store({
address : JSON.parse(uni.getStorageSync(ADDRESS) || '[]'), address : JSON.parse(uni.getStorageSync(ADDRESS) || '[]'),
sessionData : [], sessionData : [],
sessionMsgCount : 0, sessionMsgCount : 0,
openId : '' openId : uni.getStorageSync(OPPED_ID) || ''
}, },
mutations:{ mutations:{
SET_TOKEN (state, token = ''){ SET_TOKEN (state, token = ''){
@ -47,6 +49,7 @@ export default new Vuex.Store({
}, },
SET_OPEN_ID (state, data){ SET_OPEN_ID (state, data){
state.openId = data; state.openId = data;
uni.setStorageSync(OPPED_ID, data);
} }
}, },
actions : { actions : {

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.0770513e.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.98fde116.js></script></body></html>

2
h5/static/js/index.0770513e.js → h5/static/js/index.98fde116.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.06f61e05.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.74073d03.js
View File

File diff suppressed because one or more lines are too long

5
pages/order/submit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-20 14:14:53 * @Date: 2022-03-20 14:14:53
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-28 18:36:23 * @LastEditTime: 2022-04-28 18:49:36
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -198,8 +198,9 @@ export default {
签名 paySign 是 String(64) C380BEC2BFD727A4B6845133519F3AD6 签名 签名 paySign 是 String(64) C380BEC2BFD727A4B6845133519F3AD6 签名
*/ */
const par = result.dataInfo; const par = result.dataInfo;
console.log(result);
WeixinJSBridge.invoke('getBrandWCPayRequest', { WeixinJSBridge.invoke('getBrandWCPayRequest', {
appId : result.appId, appId : par.appId,
timeStamp : par.timeStamp, timeStamp : par.timeStamp,
nonceStr : par.nonceStr, nonceStr : par.nonceStr,
package : par.packageValue, package : par.packageValue,

Write Preview
Loading…
Cancel
Save