Commit bbf88c5ca82f2a9a54e14de919e48e207173ea24
1 parent
be8e7fa9
活动
Showing
6 changed files
with
22 additions
and
18 deletions
admin-web-master/src/utils/request.js
| ... | ... | @@ -16,8 +16,8 @@ let hostall = window.location.href; |
| 16 | 16 | let baseURL = '' |
| 17 | 17 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 18 | 18 | |
| 19 | - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 20 | - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 19 | + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 20 | + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; | |
| 21 | 21 | |
| 22 | 22 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 23 | 23 | ... | ... |
admin-web-master/src/views/serve/actSp.vue
| ... | ... | @@ -468,7 +468,7 @@ this.total = res.data.content.length |
| 468 | 468 | this.actPage.pageNumber = 0 |
| 469 | 469 | const res = await Registration(this.actPage) |
| 470 | 470 | this.mingList = res.data.content |
| 471 | - this.mingtotal = res.totalElements | |
| 471 | + this.mingtotal = res.data.totalElements | |
| 472 | 472 | |
| 473 | 473 | this.baoming = true |
| 474 | 474 | |
| ... | ... | @@ -477,7 +477,8 @@ this.total = res.data.content.length |
| 477 | 477 | this.actPage.pageNumber = val |
| 478 | 478 | const res = await Registration(this.actPage) |
| 479 | 479 | this.mingList = res.data.content |
| 480 | - this.mingtotal = res.totalElements | |
| 480 | + this.mingtotal = res.data.totalElements | |
| 481 | + | |
| 481 | 482 | } |
| 482 | 483 | } |
| 483 | 484 | } | ... | ... |
lvdao-miniapp/pages/activityDetail/activityDetail.vue
| ... | ... | @@ -130,9 +130,11 @@ export default { |
| 130 | 130 | }); |
| 131 | 131 | return |
| 132 | 132 | } |
| 133 | + // const dateString = this.getCurrentDateTime() | |
| 134 | + // this.form.signUpTime = new Date(dateString) | |
| 133 | 135 | this.form.activityApplicationId = this.tableData.id |
| 134 | 136 | this.form.signUpTime = this.getCurrentDateTime() |
| 135 | - this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,3).then(res => { | |
| 137 | + this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,1).then(res => { | |
| 136 | 138 | console.log('res',res.data) |
| 137 | 139 | if(res.data.code == '200'){ |
| 138 | 140 | setTimeout(()=>{ |
| ... | ... | @@ -177,6 +179,7 @@ export default { |
| 177 | 179 | |
| 178 | 180 | return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; |
| 179 | 181 | }, |
| 182 | + | |
| 180 | 183 | } |
| 181 | 184 | }; |
| 182 | 185 | </script> | ... | ... |
lvdao-miniapp/utils/request.js
| 1 | 1 | |
| 2 | 2 | // let hostall = window.location.href; |
| 3 | 3 | // let c1 = hostall.split('cdwlMall')[0]; |
| 4 | -// let c1 = 'https://jy.scjysm.asia:18086/' | |
| 5 | -let c1 = 'https://zhgw-uat.028wlkj.com/' | |
| 4 | +let c1 = 'https://jy.scjysm.asia:18086/' | |
| 5 | +// let c1 = 'https://zhgw-uat.028wlkj.com/' | |
| 6 | 6 | //封装request请求 |
| 7 | 7 | const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { |
| 8 | 8 | //判断header提交数据类型 | ... | ... |
merchant-web-master/src/utils/request.js
| ... | ... | @@ -19,8 +19,8 @@ let PREFIX; |
| 19 | 19 | if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){ |
| 20 | 20 | // 其他情况的默认值 |
| 21 | 21 | // PREFIX = 'http://8.130.38.56:8027/business-server'; |
| 22 | - PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; | |
| 23 | - // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; | |
| 22 | + // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; | |
| 23 | + PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; | |
| 24 | 24 | // PREFIX = 'http://128.10.249.8:9004'; |
| 25 | 25 | }else{ |
| 26 | 26 | // PREFIX = '/merchant-business'; | ... | ... |
merchant-web-master/src/views/system/shopSys/index.vue
| ... | ... | @@ -66,7 +66,7 @@ |
| 66 | 66 | type="textarea" |
| 67 | 67 | /> |
| 68 | 68 | </el-form-item> |
| 69 | - <el-form-item label="注册手机号" prop="shopPhone"> | |
| 69 | + <!-- <el-form-item label="注册手机号" prop="shopPhone"> | |
| 70 | 70 | <el-input |
| 71 | 71 | v-if="shopPhoneShow" |
| 72 | 72 | :value="hidden(storeDetails.shopPhone,3,4)" |
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 | v-model="storeDetails.shopPhone" |
| 80 | 80 | :disabled="disabled1" |
| 81 | 81 | /> |
| 82 | - </el-form-item> | |
| 82 | + </el-form-item> --> | |
| 83 | 83 | </div> |
| 84 | 84 | <div class="h5"> |
| 85 | 85 | <!-- <div class="title">店铺认证</div> --> |
| ... | ... | @@ -171,13 +171,13 @@ export default { |
| 171 | 171 | oldShopPhone: '', |
| 172 | 172 | oldReturnPhone: '', |
| 173 | 173 | rules: { |
| 174 | - shopPhone: [ | |
| 175 | - { required: true, message: '请输入注册手机号', trigger: 'blur' }, | |
| 176 | - { | |
| 177 | - pattern: /^1[3456789]\d{9}$/, | |
| 178 | - message: '目前只支持中国大陆的手机号码' | |
| 179 | - } | |
| 180 | - ], | |
| 174 | + // shopPhone: [ | |
| 175 | + // { required: true, message: '请输入注册手机号', trigger: 'blur' }, | |
| 176 | + // { | |
| 177 | + // pattern: /^1[3456789]\d{9}$/, | |
| 178 | + // message: '目前只支持中国大陆的手机号码' | |
| 179 | + // } | |
| 180 | + // ], | |
| 181 | 181 | returnPhone: [ |
| 182 | 182 | { required: true, message: '请输入联系电话', trigger: 'blur' }, |
| 183 | 183 | { | ... | ... |