From 8238a0ad03a6fa025359444c8e6c050f1376d0d8 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Tue, 5 Nov 2024 17:40:16 +0800 Subject: [PATCH] upload --- ext.json | 56 +++++++++++------------ pages/edit/edit.js | 30 +++++++------ pages/radetail/joinActivity/edit.js | 26 ++++++----- pages/radetail/success/index.js | 70 +++++++++++++++-------------- pages3/setUserInfo/index.js | 30 +++++++------ project.config.json | 2 +- 6 files changed, 109 insertions(+), 105 deletions(-) diff --git a/ext.json b/ext.json index 34dfe10..cae2f04 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": "1698320008", "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", - "businessSwitch": "1", + "mchIdOld": "1698320008", + "configUrl": "https://c.malls.iformall.com/C/api", + "ifStoreApp": "0", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "金泸商务", - "weappId": "wx649b3be73c1afe47", - "appVersion": "C.test.5.2.0" + "name": "株洲东都国际广场", + "weappId": "wxdcaa5b92ea7de725", + "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", @@ -75,17 +84,7 @@ "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF" }, - "plugins": { - "auto-points-plugin": { - "version": "1.3.0", - "provider": "wxfab2bf944bfc4da6" - }, - "live-player-plugin": { - "version": "1.3.4", - "provider": "wx2b03c6e691cd7370" - } - }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wxdcaa5b92ea7de725", "extEnable": true, "permission": { "scope.userLocation": { @@ -97,8 +96,5 @@ "request": 30000, "downloadFile": 10000 }, - "requiredPrivateInfos": [ - "chooseLocation", - "getLocation" - ] + "privacy_api_not_use": true } \ No newline at end of file diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 441d9d1..e372ea6 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -56,20 +56,22 @@ Page({ }) }, address: function () { - let that = this; - wx.chooseLocation({ - success: function (res) { - that.setData({ - address: res.name + '(' + res.address + ')', - addressStr: JSON.stringify(res) - }) - }, - fail: function (error) { - console.log(error) - }, - complete: function (data) { - } - }) + return + // let that = this; + // wx.choose + // Location({ + // success: function (res) { + // that.setData({ + // address: res.name + '(' + res.address + ')', + // addressStr: JSON.stringify(res) + // }) + // }, + // fail: function (error) { + // console.log(error) + // }, + // complete: function (data) { + // } + // }) }, formSubmit: function (e) { console.log(e.detail, "formSubmit") diff --git a/pages/radetail/joinActivity/edit.js b/pages/radetail/joinActivity/edit.js index a4bb74f..b47caca 100644 --- a/pages/radetail/joinActivity/edit.js +++ b/pages/radetail/joinActivity/edit.js @@ -62,19 +62,21 @@ Page({ }) }, address: function () { + return let that = this; - wx.chooseLocation({ - success: function (res) { - that.setData({ - address: res.name + '(' + res.address + ')', - addressStr: JSON.stringify(res) - }) - }, - fail: function (error) { - console.log(error) - }, - complete: function (data) { } - }) + // wx.chooseLo + // cation({ + // success: function (res) { + // that.setData({ + // address: res.name + '(' + res.address + ')', + // addressStr: JSON.stringify(res) + // }) + // }, + // fail: function (error) { + // console.log(error) + // }, + // complete: function (data) { } + // }) }, change(value) { console.log(value) diff --git a/pages/radetail/success/index.js b/pages/radetail/success/index.js index fb5b6f0..79d7fb8 100644 --- a/pages/radetail/success/index.js +++ b/pages/radetail/success/index.js @@ -23,11 +23,11 @@ Page({ array1: ['附近住户', '距离2km', '距离3km', '更远'], index: 0, index1: 0, - showPage:false, - credit:"", - goHomeUrl:"", + showPage: false, + credit: "", + goHomeUrl: "", }, - gotomyAc(){ + gotomyAc() { wx.navigateTo({ url: '/pages/user/myactivity/index', }) @@ -64,20 +64,22 @@ Page({ }) }, address: function () { + return let that = this; - wx.chooseLocation({ - success: function (res) { - that.setData({ - address: res.name + '(' + res.address + ')', - addressStr: JSON.stringify(res) - }) - }, - fail: function (error) { - console.log(error) - }, - complete: function (data) { - } - }) + // wx.chooseL + // ocation({ + // success: function (res) { + // that.setData({ + // address: res.name + '(' + res.address + ')', + // addressStr: JSON.stringify(res) + // }) + // }, + // fail: function (error) { + // console.log(error) + // }, + // complete: function (data) { + // } + // }) }, formSubmit: function (e) { let that = this; @@ -115,7 +117,7 @@ Page({ if (username == null || address == null || sex == 0 || birthdate == null) { wx.showToast({ title: '请输入完整的用户信息', - icon:"none" + icon: "none" }) } else { Http.post({ @@ -128,22 +130,22 @@ Page({ activityId: that.data.activityId } }) - .then(res => { - wx.showToast({ - title: "修改成功", - icon: 'none', - duration: 2000, - mask: false + .then(res => { + wx.showToast({ + title: "修改成功", + icon: 'none', + duration: 2000, + mask: false + }) }) - }) - .catch(err => { - wx.showToast({ - title: err.message, - icon: 'none', - duration: 2000, - mask: false + .catch(err => { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2000, + mask: false + }) }) - }) } }, radioChange: function (e) { @@ -161,7 +163,7 @@ Page({ goHomeUrl: app.globalData.goHomeUrl, }) console.log(options) - if (options && options.activityId){ + if (options && options.activityId) { that.setData({ activityId: options.activityId }) @@ -177,7 +179,7 @@ Page({ } }).then(res => { if (res && res.data && res.data.activity) { - if (res.data.activity.useCredit===1){ + if (res.data.activity.useCredit === 1) { that.setData({ credit: res.data.activity.credit }) diff --git a/pages3/setUserInfo/index.js b/pages3/setUserInfo/index.js index 643bc7d..2dfc750 100644 --- a/pages3/setUserInfo/index.js +++ b/pages3/setUserInfo/index.js @@ -115,21 +115,23 @@ Page({ }, setAddress() { + return let that = this; - wx.chooseLocation({ - success: function (res) { - that.setData({ - address: res.name + '(' + res.address + ')', - addressStr: JSON.stringify(res) - }) - }, - fail: function (error) { - console.log(error) - }, - complete: function (data) { - - } - }) + // wx.chooseL + // ocation({ + // success: function (res) { + // that.setData({ + // address: res.name + '(' + res.address + ')', + // addressStr: JSON.stringify(res) + // }) + // }, + // fail: function (error) { + // console.log(error) + // }, + // complete: function (data) { + + // } + // }) }, goSetChildren() { 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": {},