mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
weipengfei 2024-03-26 17:21:22 +08:00
parent f4cf86803e
commit 38d8bb7c81
6 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
App.vue
View File

@ -120,26 +120,23 @@
if (option?.referrerInfo?.extraData?.uniMP) {
uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
// this.$store.commit("LOGIN", {
// 'token': option.referrerInfo?.extraData?.token,
// 'time': 604800
// });
parseToken({
token: option.referrerInfo?.extraData?.token
}).then((res)=>{
this.$store.commit("LOGIN", {
'token': res.data.token,
'time': 604800
});
this.$isResolve()
}).catch((err)=>{
this.$store.commit("LOGIN", {
'token': option.referrerInfo?.extraData?.token,
'time': 604800
});
console.log('TOKEN解析错误:', err);
this.$isResolve()
})
this.$isResolve()
// parseToken({
// token: option.referrerInfo?.extraData?.token
// }).then((res)=>{
// this.$store.commit("LOGIN", {
// 'token': res.data.token,
// 'time': 604800
// });
// this.$isResolve()
// }).catch((err)=>{
// this.$store.commit("LOGIN", {
// 'token': option.referrerInfo?.extraData?.token,
// 'time': 604800
// });
// console.log('TOKEN解析错误:', err);
// this.$isResolve()
// })
}else {
this.$isResolve()
}

2
api/appLet.js
View File

@ -1,7 +1,7 @@
import request from "@/utils/request.js";
/**
* 文章详情
*
*
*/
export function parseToken(data) {

4
config/app.js
View File

@ -9,9 +9,9 @@ let httpApiThree
let wsApi
// 在打包之前请检查当前环境是否正确
// const env = 'dev'; // 开发
const env = 'dev'; // 开发
// const env = 'prod'; // 生产
const env = 'prew'; // 预上线
// const env = 'prew'; // 预上线
switch (env) {
case 'prod':

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农商户平台",
"appid" : "__UNI__1EE148C",
"description" : "",
"versionName" : "1.3.9",
"versionCode" : 139,
"versionName" : "1.4.0",
"versionCode" : 1400,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

2
pages/admin/order/index.vue
View File

@ -201,7 +201,7 @@
options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE");
this.getOrderStatistics(this.mer_id);
this.getList(this.mer_id)
this.purchaseOrderList(this.mer_id)
// this.purchaseOrderList(this.mer_id)
},
methods: {
getIndex: function() {

30
pages/index/index.vue
View File

@ -551,11 +551,11 @@
// type: 3,
// image: require('@/static/images/index4.png')
// },
{
name: '扫码付款',
type: 18,
image: require('@/static/images/index25.png')
},
// {
// name: '扫码付款',
// type: 18,
// image: require('@/static/images/index25.png')
// },
// {
// name: '进货管理',
// type: 4,
@ -652,11 +652,11 @@
type: 2,
image: require('@/static/images/index1.png')
},
{
name: '扫码付款',
type: 18,
image: require('@/static/images/index25.png')
},
// {
// name: '扫码付款',
// type: 18,
// image: require('@/static/images/index25.png')
// },
{
name: '提现管理',
type: 5,
@ -761,11 +761,11 @@
type: 23,
image: require('@/static/images/index26.png')
},
{
name: '扫码付款',
type: 18,
image: require('@/static/images/index25.png')
},
// {
// name: '扫码付款',
// type: 18,
// image: require('@/static/images/index25.png')
// },
// {
// name: '进货管理',
// type: 4,