diff --git a/assets/images/confirm.png b/assets/images/confirm.png
new file mode 100644
index 0000000..badb34d
Binary files /dev/null and b/assets/images/confirm.png differ
diff --git a/assets/images/waitingConfirm.png b/assets/images/waitingConfirm.png
new file mode 100644
index 0000000..cdb7539
Binary files /dev/null and b/assets/images/waitingConfirm.png differ
diff --git a/ext.json b/ext.json
index 34dfe10..baaffd8 100644
--- a/ext.json
+++ b/ext.json
@@ -1,104 +1 @@
-{
- "ext": {
- "attr": {
- "car": {
- "etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
- },
- "mchId": "1604439800",
- "imgProxy": [
- {
- "newUrl": "https://ctest.malls.iformall.com/img",
- "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img1",
- "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img2",
- "orgUrl": "https://wx.qlogo.cn"
- }
- ],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
- "businessSwitch": "1",
- "ifHaveWebSocket": "0",
- "ifHaveCarModular": "1"
- },
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
- },
- "debug": false,
- "tabBar": {
- "list": [
- {
- "text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "index/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "pages/theme/index1/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "门店",
- "iconPath": "assets/images/mendian.png",
- "pagePath": "index/searchbar",
- "selectedIconPath": "assets/images/mendian-a.png"
- },
- {
- "text": "停车",
- "iconPath": "assets/images/park.png",
- "pagePath": "index/passCar",
- "selectedIconPath": "assets/images/park-a.png"
- },
- {
- "text": "我的",
- "iconPath": "assets/images/user.png",
- "pagePath": "index/user",
- "selectedIconPath": "assets/images/user-a.png"
- }
- ],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
- },
- "window": {
- "backgroundTextStyle": "dark",
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#FFFFFF"
- },
- "plugins": {
- "auto-points-plugin": {
- "version": "1.3.0",
- "provider": "wxfab2bf944bfc4da6"
- },
- "live-player-plugin": {
- "version": "1.3.4",
- "provider": "wx2b03c6e691cd7370"
- }
- },
- "extAppid": "wx649b3be73c1afe47",
- "extEnable": true,
- "permission": {
- "scope.userLocation": {
- "desc": "你的位置信息将用于小程序位置接口的效果展示"
- }
- },
- "directCommit": false,
- "networkTimeout": {
- "request": 30000,
- "downloadFile": 10000
- },
- "requiredPrivateInfos": [
- "chooseLocation",
- "getLocation"
- ]
-}
\ No newline at end of file
+{"ext": {"attr": {"car": {"tjd": {"payPath": "", "tjdAppId": "wx6945d1bda68d7993"}, "etcp": {"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": "1630349477", "imgProxy": [{"newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn"}], "mchIdOld": "1604439800", "configUrl": "https://c.malls.iformall.com/C/api", "ifStoreApp": "0", "businessSwitch": "1", "businessVersion": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "0"}, "name": "琅琊金鹏玖玖广场", "weappId": "wx6af487474e8b7fb3", "appVersion": "C.5.1.1"}, "debug": false, "tabBar": {"list": [{"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "index/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "pages/theme/index1/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "门店", "iconPath": "assets/images/mendian.png", "pagePath": "index/searchbar", "selectedIconPath": "assets/images/mendian-a.png"}, {"text": "停车", "iconPath": "assets/images/park.png", "pagePath": "index/passCar", "selectedIconPath": "assets/images/park-a.png"}, {"text": "我的", "iconPath": "assets/images/user.png", "pagePath": "index/user", "selectedIconPath": "assets/images/user-a.png"}], "custom": true}, "window": {"backgroundTextStyle": "dark", "navigationBarTextStyle": "black", "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF"}, "plugins": {"auto-points-plugin": {"version": "2.4.0", "provider": "wxfab2bf944bfc4da6"}, "live-player-plugin": {"version": "1.2.5", "provider": "wx2b03c6e691cd7370"}}, "extAppid": "wx6af487474e8b7fb3", "extEnable": true, "permission": {"scope.userLocation": {"desc": "你的位置信息将用于小程序位置接口的效果展示"}}, "directCommit": false, "networkTimeout": {"request": 30000, "downloadFile": 10000}, "requiredPrivateInfos": ["chooseLocation"]}
\ No newline at end of file
diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js
index 0fa6373..5d2f972 100755
--- a/pages/getphoneInfo/index.js
+++ b/pages/getphoneInfo/index.js
@@ -15,9 +15,11 @@ Page({
fillIndentId: "",
couponId: "",
go: '',
- id: ''
+ id: '',
+ isPhone: false
// skip: app.globalData.skip
},
+
onLoad: function (options) {
console.log(options, 'options');
var that = this;
@@ -119,12 +121,27 @@ Page({
}
})
},
+
+ changePhoneStatus() {
+ const isPhone = this.data.isPhone
+ this.setData({
+ isPhone: !isPhone
+ })
+ },
+
backHome: function () {
wx.switchTab({
url: app.globalData.goHomeUrl,
})
},
getPhoneNumber: function (e) {
+ if (!this.data.isPhone) {
+ wx.showToast({
+ title: '请您阅读并勾选用户协议哦',
+ icon: "none"
+ })
+ return
+ }
var that = this;
var iv = e.detail.iv;
var encryptedData = e.detail.encryptedData;
diff --git a/pages/getphoneInfo/index.wxml b/pages/getphoneInfo/index.wxml
index 34da502..0cd8d3f 100755
--- a/pages/getphoneInfo/index.wxml
+++ b/pages/getphoneInfo/index.wxml
@@ -8,10 +8,16 @@
登录后可以更好的体验我们哦~
-
- 请升级微信版本
+
+
+ 请升级微信版本
- 登录/注册即代表同意用户协议与隐私政策
+
+
+
+ 我已阅读并同意《用户协议与隐私政策》
+
+
\ No newline at end of file
diff --git a/pages/getphoneInfo/index.wxss b/pages/getphoneInfo/index.wxss
index bb7a99a..6c89e1d 100755
--- a/pages/getphoneInfo/index.wxss
+++ b/pages/getphoneInfo/index.wxss
@@ -71,5 +71,17 @@ page {
position: fixed;
bottom: 50rpx;
font-size: 25rpx;
+}
+
+.protocol image {
+ position: absolute;
+ left: -50rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 40rpx;
+ height: 40rpx;
+}
+
+.protocol .text {
color: #00c0ff;
}
\ No newline at end of file
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": {},