diff --git a/App.vue b/App.vue
index 7fef10f5..8800f7d7 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url:'http://shopxo.com/',
+ request_url:'https://new.shopxo.vip/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
- static_url:'http://shopxo.com/',
+ static_url:'https://new.shopxo.vip/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',
diff --git a/locale/en.json b/locale/en.json
index a01e1753..679285a9 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -74,6 +74,14 @@
"not_supported_scan_tips": "H5 webpage does not support scanning codes",
"copy_link": "Copy link"
},
+ "client": {
+ "weixin": "WeChat",
+ "alipay": "Alipay",
+ "baidu": "Baidu",
+ "qq": "QQ",
+ "toutiao": "Headlines/Tiktok",
+ "kuaishou": "Kwai"
+ },
"pages": {
"goods-category": "Product classification",
"cart": "shopping cart",
@@ -270,7 +278,7 @@
"i1deai": "Confirm login",
"t75ee8": "New User Registration",
"9d8gqi": "Retrieve password",
- "tvl242": "Use authorization to automatically log in",
+ "tvl242": "Authorization to automatically log in",
"9q27d8": "Other login methods",
"t59dho": "Temporarily closed registration",
"hvunf8": "Confirm Registration",
diff --git a/locale/zh.json b/locale/zh.json
index 2f25fc96..9849aace 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -74,6 +74,14 @@
"not_supported_scan_tips": "H5网页不支持扫码",
"copy_link": "复制链接"
},
+ "client": {
+ "weixin": "微信",
+ "alipay": "支付宝",
+ "baidu": "百度",
+ "qq": "QQ",
+ "toutiao": "头条/抖音",
+ "kuaishou": "快手"
+ },
"pages": {
"goods-category": "商品分类",
"cart": "购物车",
@@ -267,7 +275,7 @@
"i1deai": "确认登录",
"t75ee8": "新用户注册",
"9d8gqi": "找回密码",
- "tvl242": "使用授权自动登录",
+ "tvl242": "授权自动登录",
"9q27d8": "其他登录方式",
"t59dho": "暂时关闭了注册",
"hvunf8": "确认注册",
diff --git a/manifest.json b/manifest.json
index a726ad7c..a62a3acf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -171,7 +171,7 @@
"startLocationUpdate",
"startLocationUpdateBackground"
],
- "appid" : "wxda7779770f53e901",
+ "appid" : "wx60d4d16792b6cf0b",
"setting" : {
"urlCheck" : false,
"es6" : true,
@@ -186,19 +186,18 @@
}
},
"__usePrivacyCheck__" : true,
- "plugins" : {
- // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
- // "routePlan" : {
- // "version" : "1.0.19",
- // "provider" : "wx50b5593e81dd937a"
- // },
- // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
- // "live-player-plugin" : {
- // "version" : "1.3.5",
- // "provider" : "wx2b03c6e691cd7370"
- // }
- }
+ "plugins" : {}
},
+ // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
+ // "routePlan" : {
+ // "version" : "1.0.19",
+ // "provider" : "wx50b5593e81dd937a"
+ // },
+ // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
+ // "live-player-plugin" : {
+ // "version" : "1.3.5",
+ // "provider" : "wx2b03c6e691cd7370"
+ // }
"mp-alipay" : {
"usingComponents" : true,
"appid" : "2021001173639600"
@@ -248,7 +247,7 @@
"port" : 8082
},
"router" : {
- "mode" : "history",
+ "mode" : "hash",
"base" : "./"
},
"title" : "ShopXO",
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d2163c4b..6526bbe5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -304,13 +304,13 @@
-
+
-
+
-
+
@@ -440,7 +440,7 @@
form_input_email_value: '',
form_input_accounts_value: '',
form_input_image_verify_value: '',
- verify_submit_text: this.$t('login.login.s665h5'),
+ verify_submit_text: '',
verify_loading: false,
verify_disabled: false,
form_submit_loading: false,
@@ -475,9 +475,10 @@
app_login_provider_list: [],
// 错误提示信息
error_msg: null,
-
// 登录方式弹窗状态
popup_login_status: false,
+ // 客户端名称
+ client_text: '',
};
},
@@ -580,6 +581,8 @@
success: this.$t('login.login.5p23c6'),
bind_platform: this.$t('login.login.876tdf'),
},
+ verify_submit_text: this.$t('login.login.s665h5'),
+ client_text: this.$t('client.'+this.client_value),
});
},
@@ -721,6 +724,9 @@
success: (res) => {
this.user_auth_code(res.userInfo);
},
+ fail: (res) => {
+ app.globalData.user_login_handle(this, 'user_auth_back_event');
+ }
});
// #endif
// #ifdef MP-QQ