diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 4911a3d..b492344 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,8 +16,8 @@ let hostall = window.location.href; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue index 02ff7f0..a75b49e 100644 --- a/admin-web-master/src/views/serve/actSp.vue +++ b/admin-web-master/src/views/serve/actSp.vue @@ -468,7 +468,7 @@ this.total = res.data.content.length this.actPage.pageNumber = 0 const res = await Registration(this.actPage) this.mingList = res.data.content - this.mingtotal = res.totalElements + this.mingtotal = res.data.totalElements this.baoming = true @@ -477,7 +477,8 @@ this.total = res.data.content.length this.actPage.pageNumber = val const res = await Registration(this.actPage) this.mingList = res.data.content - this.mingtotal = res.totalElements + this.mingtotal = res.data.totalElements + } } } diff --git a/lvdao-miniapp/pages/activityDetail/activityDetail.vue b/lvdao-miniapp/pages/activityDetail/activityDetail.vue index 3ebf5b9..7236008 100644 --- a/lvdao-miniapp/pages/activityDetail/activityDetail.vue +++ b/lvdao-miniapp/pages/activityDetail/activityDetail.vue @@ -130,9 +130,11 @@ export default { }); return } + // const dateString = this.getCurrentDateTime() + // this.form.signUpTime = new Date(dateString) this.form.activityApplicationId = this.tableData.id this.form.signUpTime = this.getCurrentDateTime() - this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,3).then(res => { + this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,1).then(res => { console.log('res',res.data) if(res.data.code == '200'){ setTimeout(()=>{ @@ -177,6 +179,7 @@ export default { return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; }, + } }; diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 22682f0..39a2350 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,8 +1,8 @@ // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -// let c1 = 'https://jy.scjysm.asia:18086/' -let c1 = 'https://zhgw-uat.028wlkj.com/' +let c1 = 'https://jy.scjysm.asia:18086/' +// let c1 = 'https://zhgw-uat.028wlkj.com/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型 diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index f9bc6d9..ca83694 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -19,8 +19,8 @@ let PREFIX; if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){ // 其他情况的默认值 // PREFIX = 'http://8.130.38.56:8027/business-server'; - PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; - // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; + // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; + PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; // PREFIX = 'http://128.10.249.8:9004'; }else{ // PREFIX = '/merchant-business'; diff --git a/merchant-web-master/src/views/system/shopSys/index.vue b/merchant-web-master/src/views/system/shopSys/index.vue index 7e852ce..e7d86d7 100644 --- a/merchant-web-master/src/views/system/shopSys/index.vue +++ b/merchant-web-master/src/views/system/shopSys/index.vue @@ -66,7 +66,7 @@ type="textarea" /> - +
@@ -171,13 +171,13 @@ export default { oldShopPhone: '', oldReturnPhone: '', rules: { - shopPhone: [ - { required: true, message: '请输入注册手机号', trigger: 'blur' }, - { - pattern: /^1[3456789]\d{9}$/, - message: '目前只支持中国大陆的手机号码' - } - ], + // shopPhone: [ + // { required: true, message: '请输入注册手机号', trigger: 'blur' }, + // { + // pattern: /^1[3456789]\d{9}$/, + // message: '目前只支持中国大陆的手机号码' + // } + // ], returnPhone: [ { required: true, message: '请输入联系电话', trigger: 'blur' }, {