diff --git a/ext.json b/ext.json
index 34dfe10..3fc9a5c 100644
--- a/ext.json
+++ b/ext.json
@@ -2,35 +2,44 @@
"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",
- "businessSwitch": "1",
+ "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": "wxde54451891094c16",
+ "appVersion": "C.5.1.1"
},
"debug": false,
"tabBar": {
@@ -66,8 +75,7 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
+ "custom": true
},
"window": {
"backgroundTextStyle": "dark",
@@ -76,22 +84,14 @@
"navigationBarBackgroundColor": "#FFFFFF"
},
"plugins": {
- "auto-points-plugin": {
- "version": "1.3.0",
- "provider": "wxfab2bf944bfc4da6"
- },
"live-player-plugin": {
- "version": "1.3.4",
+ "version": "1.2.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wxde54451891094c16",
"extEnable": true,
- "permission": {
- "scope.userLocation": {
- "desc": "你的位置信息将用于小程序位置接口的效果展示"
- }
- },
+ "permission": {},
"directCommit": false,
"networkTimeout": {
"request": 30000,
diff --git a/extModel.json b/extModel.json
index af9aa49..1aeb650 100644
--- a/extModel.json
+++ b/extModel.json
@@ -17,7 +17,7 @@
},
"version": "release"
},
- "mchId": "1604439800",
+ "mchId": "1539123951",
"imgProxy": [
{
"newUrl": "https://c.malls.iformall.com/img",
@@ -36,10 +36,10 @@
"ifStoreApp": "0",
"businessSwitch": "1",
"ifHaveWebSocket": "0",
- "ifHaveCarModular": "0"
+ "ifHaveCarModular": "1"
},
- "name": "富茂链客生产版",
- "weappId": "wx6a2524a8286d687f",
+ "name": "欢乐城",
+ "weappId": "wx8e5cab05e850bc91",
"appVersion": "C.5.1.1"
},
"debug": false,
@@ -90,11 +90,11 @@
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
- "version": "1.3.5",
+ "version": "1.2.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx6a2524a8286d687f",
+ "extAppid": "wx8e5cab05e850bc91",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/index/user.js b/index/user.js
index 5c4c268..0725f72 100644
--- a/index/user.js
+++ b/index/user.js
@@ -155,6 +155,12 @@ Page({
})
},
+ goToInfo() {
+ wx.navigateTo({
+ url: '/pages3/setUserInfo/index',
+ })
+ },
+
/* 判断是否授权*/
userAuthorization() {
Http.get({
@@ -534,6 +540,7 @@ Page({
console.log(res)
})
},
+
/**
* 生命周期函数--监听页面显示
*/
diff --git a/index/user.wxml b/index/user.wxml
index f02377e..f14a923 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -127,6 +127,13 @@
+
+
+ 个人信息
+ >
+
+
+
我的砍价
@@ -202,6 +209,11 @@
+
+ 隐私协议
+ >
+
+
关于我们
diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js
index a5fed08..fbb4463 100644
--- a/pages/theme/index1/index.js
+++ b/pages/theme/index1/index.js
@@ -570,7 +570,7 @@ Page({
checkDialog() {
const isAgreeProtocol = wx.getStorageSync('isAgreeProtocol')
- // if (isAgreeProtocol) return
+ if (isAgreeProtocol) return
Http.get({
url: config.api.needAgreeProtocol,
}).then(res => {
diff --git a/pages3/setUserInfo/index.js b/pages3/setUserInfo/index.js
index 2dfc750..15447f2 100644
--- a/pages3/setUserInfo/index.js
+++ b/pages3/setUserInfo/index.js
@@ -157,7 +157,7 @@ Page({
const data = {
avatarUrl: that.data.avatarUrl,
nickName: e.detail.value.nickname.trim(),
- name: e.detail.value.username,
+ name: e.detail.value.username || "und",
sex: 1 * that.data.gender + 1,
birthdate: birthdate,
height: e.detail.value.height ? e.detail.value.height : that.data.height,
@@ -171,13 +171,15 @@ Page({
icon: 'error',
duration: 2000
})
- } else if (!data.name) {
- wx.showToast({
- title: '请输入真实姓名',
- icon: 'error',
- duration: 2000
- })
- } else if (data.nickName.length > 16) {
+ }
+ // else if (!data.name) {
+ // wx.showToast({
+ // title: '请输入真实姓名',
+ // icon: 'error',
+ // duration: 2000
+ // })
+ // }
+ else if (data.nickName.length > 16) {
wx.showToast({
title: '昵称上限为16字符',
icon: 'none',
@@ -200,10 +202,29 @@ Page({
}
}).catch(err => {
console.log(err);
+ wx.showToast({
+ title: err.message || "提交失败",
+ icon: 'none',
+ duration: 1500,
+ })
})
}
},
+ goCanelAccount() {
+ wx.showModal({
+ title: '提示',
+ content: '是否要注销账号?',
+ success(res) {
+ if (res.confirm) {
+ console.log('用户点击确定')
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages3/setUserInfo/index.wxml b/pages3/setUserInfo/index.wxml
index 06507eb..17d8397 100644
--- a/pages3/setUserInfo/index.wxml
+++ b/pages3/setUserInfo/index.wxml
@@ -21,13 +21,13 @@
-
+
性别*
@@ -55,7 +55,7 @@
-
+
-
+
收货地址
@@ -97,6 +97,7 @@
+
diff --git a/pages3/setUserInfo/index.wxss b/pages3/setUserInfo/index.wxss
index 565c21b..27cc5bd 100644
--- a/pages3/setUserInfo/index.wxss
+++ b/pages3/setUserInfo/index.wxss
@@ -47,8 +47,9 @@
padding-bottom: 20rpx;
border-bottom: solid 1px #dddddd;
}
+
.item .red {
- color: red;
+ color: red;
}
.itemAdress {
@@ -75,4 +76,10 @@
.submit {
margin-top: 50rpx;
+}
+
+.danger {
+ color: #ffffff;
+ background-color: red;
+ margin-top: 50rpx;
}
\ 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": {},
diff --git a/project.private.config.json b/project.private.config.json
index 0bdfa04..5403d21 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,7 +7,7 @@
"preloadBackgroundData": false,
"useIsolateContext": true
},
- "libVersion": "3.0.1",
+ "libVersion": "3.11.2",
"condition": {
"miniprogram": {
"list": [