diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
deleted file mode 100644
index 8aee044d..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { apiBaseUrl } from '@/common/setting/constVarsHelper.js';
-import * as db from '@/common/utils/dbHelper.js' //引入common
-
-
-// 这里的Vue为Vue对象(非创建出来的实例)，vm为main.js中“Vue.use(httpInterceptor, app)”这一句的第二个参数，
-// 为一个Vue的实例，也即每个页面的"this"
-// 如果需要了解这个install方法是什么，请移步：https://uviewui.com/components/vueUse.html
-const install = (Vue, vm) => {
- // 此为自定义配置参数，具体参数见上方说明
- Vue.prototype.$u.http.setConfig({
- baseUrl: apiBaseUrl, // 请求的本域名
- method: 'POST',
- dataType: 'json',// 设置为json，返回后会对数据进行一次JSON.parse()
- showLoading: true, // 是否显示请求中的loading
- loadingText: '请求中...', // 请求loading中的文字提示
- loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
- originalData: false, // 是否在拦截器中返回服务端的原始数据
- loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
- // 配置请求头信息
- header: {
- 'Content-type': 'application/json'
- },
- });
-
- // 请求拦截部分，如配置，每次请求前都会执行
- Vue.prototype.$u.http.interceptor.request = (config) => {
- if (config.header.needToken) {
- // 获取用户token
- const userToken = db.get("userToken");
- if (!userToken) {
- console.log("开启弹窗");
- Vue.prototype.$store.commit('showLoginTip', true);
- return false;
- } else {
- config.header.Authorization = 'Bearer ' + userToken;
- }
- }
- //额外需求
- if (config.header.method == 'user.share') {
- const userToken = db.get("userToken");
- config.header.Authorization = 'Bearer ' + userToken;
- }
- return config;
- }
- // 响应拦截，如配置，每次请求结束都会执行本方法
- Vue.prototype.$u.http.interceptor.response = (result) => {
- let pages = getCurrentPages();
- var page = pages[pages.length - 1];
-
- if (!result.status && page) {
- //console.log(page.route);
- // 登录信息过期或者未登录
- if (result.data === 14007 || result.data === 14006) {
- // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
- if (page.route.indexOf('pages/login/loginBySMS/loginBySMS') < 0) {
- db.del("userToken");
- uni.showToast({
- title: result.msg,
- icon: 'none',
- duration: 1000,
- complete: function () {
- setTimeout(function () {
- uni.hideToast();
- uni.navigateTo({
- url: '/pages/login/loginBySMS/loginBySMS'
- });
- },
- 1000);
- }
- });
- }
- // #endif
- // #ifdef MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO
- db.del("userToken");
- console.log("开启登录弹窗");
- //Vue.prototype.$store.commit('showLoginTip', true);
- Vue.prototype.$store.commit('hasLogin', false);
- // #endif
- }
- }
-
- return result;
- // res为服务端返回值，可能有code，result等字段
- // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
- // 如果配置了originalData为true，请留意这里的返回值
-
-
- }
-}
-
-export default {
- install
-}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/request.js b/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
index 0c7a18d7..8179283c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/request.js
@@ -7,9 +7,9 @@ module.exports = (vm) => {
uni.$u.http.setConfig((defaultConfig) => {
/* defaultConfig 为默认全局配置 */
defaultConfig.baseURL = apiBaseUrl; /* 根域名 */
- defaultConfig.header = {
- 'Content-type': 'application/json'
- };
+ //defaultConfig.header = {
+ // 'Content-type': 'application/json'
+ //};
defaultConfig.method = 'POST';
defaultConfig.dataType = 'json';
// #ifndef MP-ALIPAY
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index 7190b025..3efe7989 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -63,7 +63,11 @@
-
+
+
+
+
+
同意
《服务协议》
@@ -77,7 +81,7 @@
暂不授权
- 确定授权
+ 确定授权
@@ -100,6 +104,7 @@
data() {
return {
agreement: true,
+ isDisabled: false,
maxMobile: 11,
mobile: '', // 用户手机号
code: '', // 短信验证码
@@ -363,7 +368,13 @@
},
// 勾选版权协议
checkboxChange(e) {
- this.agreement = e.value;
+ this.agreement = e;
+ if (e == true) {
+ this.isDisabled = false;
+ } else {
+ this.isDisabled = true;
+ }
+ console.log(this.agreement);
},
// 隐藏登录弹窗
hideModal() {
@@ -425,23 +436,31 @@
})
},
async getPhoneNumber(e) {
- let _this = this;
- if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
- var data = {
- sessionAuthId: _this.sessionAuthIdTool,
- iv: e.mp.detail.iv,
- encryptedData: e.mp.detail.encryptedData,
- }
- //有推荐码的话，带上
- var invitecode = _this.$db.get('invitecode')
- if (invitecode) {
- data.invitecode = invitecode
- }
- _this.toGetPhoneNumber(data);
+ console.log(e);
+ console.log(this.isDisabled);
+ if (this.isDisabled == false) {
+ this.$refs.uToast.show({ message: '请先勾选并同意服务', type: 'error', })
+ return false;
} else {
- _this.$u.toast('如未授权，您可尝试使用手机号+短信验证码登录');
+ let _this = this;
+ if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
+ var data = {
+ sessionAuthId: _this.sessionAuthIdTool,
+ iv: e.mp.detail.iv,
+ encryptedData: e.mp.detail.encryptedData,
+ }
+ //有推荐码的话，带上
+ var invitecode = _this.$db.get('invitecode')
+ if (invitecode) {
+ data.invitecode = invitecode
+ }
+ _this.toGetPhoneNumber(data);
+ } else {
+ _this.$u.toast('如未授权，您可尝试使用手机号+短信验证码登录');
+ }
+ _this.showLogin = false;
}
- _this.showLogin = false;
+
},
//实际的去登陆
toGetPhoneNumber: function (data) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
index 8905b09b..1947ac56 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
@@ -42,8 +42,10 @@
-
- 添加收货地址
+
+
+ 添加收货地址
+
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Bold.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Bold.ttf
deleted file mode 100644
index 37e3fa7e..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Bold.ttf and /dev/null differ
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-ExtraLight.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-ExtraLight.ttf
deleted file mode 100644
index e8f64c33..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-ExtraLight.ttf and /dev/null differ
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Heavy.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Heavy.ttf
deleted file mode 100644
index 9b5f5f70..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Heavy.ttf and /dev/null differ
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Light.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Light.ttf
deleted file mode 100644
index 1abae279..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Light.ttf and /dev/null differ
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Medium.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Medium.ttf
deleted file mode 100644
index 8d92d092..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Medium.ttf and /dev/null differ
diff --git a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Regular.ttf b/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Regular.ttf
deleted file mode 100644
index 52a4dec3..00000000
Binary files a/CoreCms.Net.Web.WebApi/wwwroot/fonts/SourceHanSansK-Regular.ttf and /dev/null differ