From ac5fcc5c3b8bd3b9cf5d464e407b61d33ad23f10 Mon Sep 17 00:00:00 2001
From: YWQ HK IX <568170040@qq.com>
Date: Thu, 5 Dec 2024 15:26:52 +0800
Subject: [PATCH] upload
---
app.js | 7 +++---
ext.json | 41 +++++++++++++++++++++--------------
index/index.js | 1 +
pages/theme/index1/index.js | 1 +
pages/theme/index1/index.wxml | 1 -
pages3/resume/resume.js | 29 ++++++++++++-------------
project.config.json | 2 +-
7 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/app.js b/app.js
index 75b2ace..c6ae52f 100644
--- a/app.js
+++ b/app.js
@@ -123,10 +123,9 @@ App({
if (res.data.subMalls) {
const squareList = JSON.parse(res.data.subMalls)
wx.setStorageSync("squareList", squareList)
- if (res.data.mall) {
- wx.setStorageSync("selectedMall", res.data.mall.tenantId)
- }
-
+ }
+ if (res.data.mall) {
+ wx.setStorageSync("selectedMall", res.data.mall.tenantId)
}
if (res.data && res.data.score) {
if (res.data.score != 0) {
diff --git a/ext.json b/ext.json
index 34dfe10..1aeb650 100644
--- a/ext.json
+++ b/ext.json
@@ -2,35 +2,45 @@
"ext": {
"attr": {
"car": {
+ "tjd": {
+ "payPath": "",
+ "tjdAppId": "wx6945d1bda68d7993"
+ },
"etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
+ "payPath": "pages/pay/order-pay-open/main",
+ "etcpAppId": "wxc07f9d67923d676d",
+ "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ },
+ "bolink": {
+ "payPath": "pages/park/park",
+ "bolinkAppId": "wxbd08b4baa10fcc1d"
+ },
+ "version": "release"
},
- "mchId": "1604439800",
+ "mchId": "1539123951",
"imgProxy": [
{
- "newUrl": "https://ctest.malls.iformall.com/img",
+ "newUrl": "https://c.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img1",
+ "newUrl": "https://c.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img2",
+ "newUrl": "https://c.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
+ "configUrl": "https://c.malls.iformall.com/C/api",
+ "ifStoreApp": "0",
"businessSwitch": "1",
"ifHaveWebSocket": "0",
"ifHaveCarModular": "1"
},
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
+ "name": "欢乐城",
+ "weappId": "wx8e5cab05e850bc91",
+ "appVersion": "C.5.1.1"
},
"debug": false,
"tabBar": {
@@ -66,8 +76,7 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
+ "custom": true
},
"window": {
"backgroundTextStyle": "dark",
@@ -81,11 +90,11 @@
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
- "version": "1.3.4",
+ "version": "1.2.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wx8e5cab05e850bc91",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/index/index.js b/index/index.js
index fc7825c..51b3b04 100644
--- a/index/index.js
+++ b/index/index.js
@@ -332,6 +332,7 @@ Page({
},
//跳转到其他广场列表
goSquareList() {
+ console.log(this.data.isShowSqare, 'this.data.isShowSqare');
if (this.data.isShowSqare) {
wx.navigateTo({
url: '/pages/location/location',
diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js
index 18397a2..99d6fdc 100644
--- a/pages/theme/index1/index.js
+++ b/pages/theme/index1/index.js
@@ -338,6 +338,7 @@ Page({
},
//跳转到其他广场列表
goSquareList() {
+ console.log(this.data.isShowSqare, 'this.data.isShowSqare');
if (this.data.isShowSqare) {
wx.navigateTo({
url: '/pages/location/location',
diff --git a/pages/theme/index1/index.wxml b/pages/theme/index1/index.wxml
index 23e8ae2..45bdad9 100644
--- a/pages/theme/index1/index.wxml
+++ b/pages/theme/index1/index.wxml
@@ -8,7 +8,6 @@
-
diff --git a/pages3/resume/resume.js b/pages3/resume/resume.js
index 027b054..b748535 100644
--- a/pages3/resume/resume.js
+++ b/pages3/resume/resume.js
@@ -166,21 +166,19 @@ Page({
url: config.api.resumeAdd,
data,
}).then(res => {
- if (res.code == 200) {
- wx.showToast({
- title: "提交成功!",
- icon: 'success',
- duration: 1500,
- })
- } else {
- wx.showToast({
- title: "提交出错!",
- icon: 'error',
- duration: 1500,
- })
- }
+ console.log(res.code);
+ wx.showToast({
+ title: "提交成功!",
+ icon: 'success',
+ duration: 1500,
+ })
+ this.getResumeDetail()
}).catch(err => {
- console.log(err);
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ duration: 2000,
+ })
})
},
@@ -258,8 +256,9 @@ Page({
}).catch(err => {
app.globalData.skip = "redirectTo"
const skipUrl = "/pages3/resume/resume"
+ app.globalData.skipUrl = skipUrl
wx.redirectTo({
- url: `/pages/getphoneInfo/index?skipUrl=${skipUrl}`
+ url: `/pages/getphoneInfo/index?skipUrl=1`
});
})
},
diff --git a/project.config.json b/project.config.json
index e4bfda1..9dda0a2 100644
--- a/project.config.json
+++ b/project.config.json
@@ -35,7 +35,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
- "appid": "wxfa336cad86ed598d",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},