From 755198e112d2540d1e4ca29f5d3ff249da3eb3d3 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Wed, 11 Jan 2023 17:27:43 +0800
Subject: [PATCH] upload
---
ext.json | 41 +++++++++++++++---------
pages/joinFrDpell/index.js | 5 +--
pages/joinFrDpell/index.wxml | 1 +
pages/spellGroup/mySpellGroup/index.wxml | 2 +-
project.config.json | 2 +-
project.private.config.json | 2 +-
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ext.json b/ext.json
index 34dfe10..af9aa49 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",
"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"
+ "ifHaveCarModular": "0"
},
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
+ "name": "富茂链客生产版",
+ "weappId": "wx6a2524a8286d687f",
+ "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.3.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wx6a2524a8286d687f",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js
index e525fb1..e24296d 100644
--- a/pages/joinFrDpell/index.js
+++ b/pages/joinFrDpell/index.js
@@ -33,7 +33,8 @@ Page({
showErr: false,
showTime: true,
merchantVoList: [],
- mallList: []
+ mallList: [],
+ nickName: '微信用户'
},
/**
@@ -62,7 +63,7 @@ Page({
orderGroupId: options.orderGroupId,
orderId: options.orderId,
avatarUrl: options.avatarUrl,
- nickName: options.nickName,
+ nickName: options.nickName || '微信用户',
})
if (options.orderGroupId) {
this.checkUser(options);
diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml
index 62f5a92..18e2928 100644
--- a/pages/joinFrDpell/index.wxml
+++ b/pages/joinFrDpell/index.wxml
@@ -31,6 +31,7 @@
+
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index 0c91b75..6615795 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -47,7 +47,7 @@
- {{spellData.nickName}}的团还差1人
+ {{spellData.nickName||'微信用户'}}的团还差1人
{{day}} 天
diff --git a/project.config.json b/project.config.json
index 0a33f27..79c196c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -34,7 +34,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
- "appid": "wxfa336cad86ed598d",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
diff --git a/project.private.config.json b/project.private.config.json
index be2dd80..9feb9d7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,5 +7,5 @@
"preloadBackgroundData": false,
"useIsolateContext": true
},
- "libVersion": "2.28.1"
+ "libVersion": "2.29.1"
}
\ No newline at end of file