diff --git a/api/system/config.js b/api/system/config.js index cb4553d..3ddd71d 100644 --- a/api/system/config.js +++ b/api/system/config.js @@ -34,4 +34,12 @@ export function getByCodeInfo(params) { method: 'get', params: params }) +} + +// 根据code获取键值 +export function getConfigByCode(configKey) { + return request({ + url: '/system/config/configKey/' + configKey, + method: 'get' + }) } \ No newline at end of file diff --git a/config.js b/config.js index e49fb22..cc7d138 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,8 @@ // 应用全局配置 module.exports = { //baseUrl: 'https://3w823u8516.vicp.fun/noticeApi', - baseUrl: 'https://www.ddtg.site/noticeApi', - //baseUrl: 'http://192.168.1.6:8088', + //baseUrl: 'https://www.ddtg.site/noticeApi', + baseUrl: 'http://192.168.1.31:8088', // 应用信息 appInfo: { // 应用名称 diff --git a/pages/components/notice-index.vue b/pages/components/notice-index.vue index deebe88..69d2867 100644 --- a/pages/components/notice-index.vue +++ b/pages/components/notice-index.vue @@ -56,7 +56,7 @@ - + @@ -179,7 +179,8 @@ import rightsCode from '@/utils/rightsCode' import { getCatgByCode, - getByCodeInfo + getByCodeInfo, + getConfigByCode } from '@/api/system/config.js' import { toast, @@ -253,6 +254,7 @@ platformList: [], //博主分类 bloggerTypeList: [], + isOpenZf: '0' } }, mounted() { @@ -263,11 +265,19 @@ this.initAddress() //鉴权 // this.checkRights() + this.getConfigKey() }, onLoad: function() { }, methods: { + getConfigKey() { + getConfigByCode('isOpenZf').then(res => { + if (res.msg) { + this.isOpenZf = res.msg + } + }) + }, /**初始化树结构*/ initAddress() { treeCity().then(res => { diff --git a/pages/index.vue b/pages/index.vue index 2b3b107..f4b5029 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -145,9 +145,6 @@ that.$refs.popupNew.open('center') } }) - } else { - //未登录,弹出领取新人礼 - that.$refs.popupNew.open('center') } }, /** diff --git a/pages/mine/addr/addr-detail.vue b/pages/mine/addr/addr-detail.vue index 896d645..baccd8d 100644 --- a/pages/mine/addr/addr-detail.vue +++ b/pages/mine/addr/addr-detail.vue @@ -9,7 +9,7 @@ 收件人名称 - + @@ -17,7 +17,7 @@ 联系电话 - + diff --git a/pages/mine/card/card-detail.vue b/pages/mine/card/card-detail.vue index de987c6..39a22d4 100644 --- a/pages/mine/card/card-detail.vue +++ b/pages/mine/card/card-detail.vue @@ -43,7 +43,7 @@ 联系电话 - + @@ -149,8 +149,8 @@ addrId: null, price: null, content: null, - wxNum: null, - indexUrl: null, + wxNum: null, + indexUrl: null, } } }, @@ -269,23 +269,23 @@ toast("粉丝数不能为空") return } - if (this.dataObj.indexUrl == null || this.dataObj.indexUrl == "") { - toast("主页链接不能为空") - return - } - if (this.dataObj.wxNum == null || this.dataObj.wxNum == "") { - toast("微信号不能为空") - return - } - if (this.dataObj.tel == null || this.dataObj.tel == "") { - toast("电话不能为空") - return - } + if (this.dataObj.indexUrl == null || this.dataObj.indexUrl == "") { + toast("主页链接不能为空") + return + } + if (this.dataObj.wxNum == null || this.dataObj.wxNum == "") { + toast("微信号不能为空") + return + } + if (this.dataObj.tel == null || this.dataObj.tel == "") { + toast("电话不能为空") + return + } if (this.dataObj.addrId == null || this.dataObj.addrId == "") { toast("收货地址不能为空") return } - if (this.fileList.length == 0) { + if (!this.imageUrl || this.imageUrl.length == 0) { toast("证明材料不能为空") return } diff --git a/pages/mine/set/my-info.vue b/pages/mine/set/my-info.vue index fa63040..904c7e7 100644 --- a/pages/mine/set/my-info.vue +++ b/pages/mine/set/my-info.vue @@ -1,248 +1,251 @@ \ No newline at end of file diff --git a/static/bg.jpg b/static/bg.jpg deleted file mode 100644 index 03a698a..0000000 Binary files a/static/bg.jpg and /dev/null differ diff --git a/static/favicon.ico b/static/favicon.ico deleted file mode 100644 index 6f07782..0000000 Binary files a/static/favicon.ico and /dev/null differ diff --git a/static/index.html b/static/index.html deleted file mode 100644 index a7af653..0000000 --- a/static/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - - - - -
- \ No newline at end of file diff --git a/static/logo200.png b/static/logo200.png deleted file mode 100644 index ffa9988..0000000 Binary files a/static/logo200.png and /dev/null differ