diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue index 152f0cb..f6abb64 100644 --- a/pages/addjigou/all.vue +++ b/pages/addjigou/all.vue @@ -435,7 +435,6 @@ margin-left: 5%; padding: 5rpx; .contentred-bgc{ - background-color: rgb(240,228,228); border-radius: 15rpx; color: red; padding: 20rpx; diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index e505eec..3d6acdc 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -21,7 +21,7 @@ - 驳回原因:{{alldata.contentred}} + 驳回原因:{{alldata.content}} @@ -655,7 +655,6 @@ margin-left: 5%; padding: 5rpx; .contentred-bgc{ - background-color: rgb(240,228,228); border-radius: 15rpx; color: red; padding: 20rpx; diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index 3b6090f..eec9656 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -316,7 +316,7 @@ if (data.endTime == '长期') { data.endTime = swapLongTerm(data.endTime); } - if(izSkipRepetVali.value == 'N'){ + if(!flag.value){ if(data.optType == 'rz' && data.status == '3' && !data.orgStatus){ // 入驻重新提交 data.status = `1` @@ -330,8 +330,7 @@ data.status = '1' } } - - console.log(data.optType,data.status ,data.orgStatus) + uni.setStorageSync("backhuancun", data) changemessage(uni.getStorageSync('backhuancun'), ukey.value).then(res => { if (res.success ) { @@ -361,10 +360,13 @@ content: '当前无变更,是否提交?', success: function (res) { if (res.confirm) { + flag.value = true; izSkipRepetVali.value = "Y"; ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}` next() } else if (res.cancel) { + flag.value = true; + ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}` console.log('用户点击取消'); } } @@ -385,6 +387,7 @@ }) } } + const flag = ref(false) const izSkipRepetVali = ref('N') const goBack = () => { if (form.address) { diff --git a/request/index.js b/request/index.js index 7597bd5..0768da9 100644 --- a/request/index.js +++ b/request/index.js @@ -1,9 +1,9 @@ // 全局请求封装 // export const base_url = 'http://192.168.2.37:8081/opeapi' -export const base_url = 'https://www.focusnu.com/opeapi' +// export const base_url = 'https://www.focusnu.com/opeapi' export const media_base_url = 'https://www.focusnu.com/media/' -// export const base_url = 'http://192.168.2.24:8081/opeapi' +export const base_url = 'http://192.168.2.24:8081/opeapi' // export const base_url = 'http://192.168.2.27:8081/opeapi' // 请求超出时间 const timeout = 5000