diff --git a/.DS_Store b/.DS_Store index d6a9587..f307a0f 100644 --- a/.DS_Store +++ b/.DS_Store diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index 6a2a028..a23a99a 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -13,11 +13,11 @@ // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' // const DOMAIN_PREFIXPING = 'http://192.168.2.162:9003' // const DOMAIN_PREFIX = 'http://192.168.2.162:9007' -const host = `${window.location.protocol}//${window.location.host}` -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -// const DOMAIN_PREFIXPING = `https://jy.scjysm.asia:18086/admin-server` -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' +// const host = `${window.location.protocol}//${window.location.host}` +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` +const DOMAIN_PREFIXPING = `http://8.130.38.56:9003` +const DOMAIN_PREFIX = 'http://8.130.38.56:9007' // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' diff --git a/ceres-uniapp-master/manifest.json b/ceres-uniapp-master/manifest.json index d221efd..e8aa1f2 100644 --- a/ceres-uniapp-master/manifest.json +++ b/ceres-uniapp-master/manifest.json @@ -149,7 +149,7 @@ "h5" : { "router" : { "mode" : "history", - "base" : "cdwlMall/meh5" + "base" : "/h5" }, "title" : "问卷调查", "domain" : "", diff --git a/ceres-uniapp-master/pages/tabbar/user/index.vue b/ceres-uniapp-master/pages/tabbar/user/index.vue index 744096a..01bb16e 100644 --- a/ceres-uniapp-master/pages/tabbar/user/index.vue +++ b/ceres-uniapp-master/pages/tabbar/user/index.vue @@ -190,6 +190,7 @@ NET.request(API.GetUser, {}, 'GET').then(res => { this.userItem = res.data + this.userItem.name = this.$decrypt(res.data.name) console.log(res.data) uni.setStorageSync('storage_userInfo', this.userItem); this.isFirstComeIn = false diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue index b7cf225..7e52eae 100644 --- a/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue +++ b/ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue @@ -248,6 +248,9 @@ } this.myCommentList = res.data this.commentVOList = this.commentVOList.concat(res.data.page.list) + this.commentVOList.map(item=>{ + item.name = this.$decrypt(item.name) + }) this.commentVOList = this.commentVOList.filter(item=>!item.isLoading) if (this.commentVOList.length === 0) { this.evaluateEmpty = true diff --git a/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue b/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue index cdbc83c..01393f6 100644 --- a/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue +++ b/ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue @@ -257,8 +257,8 @@ GetUser() { NET.request(API.GetUser, {}, 'GET').then(res => { this.item = res.data - this.phone = res.data.phone - this.name = res.data.name + this.phone =this.$decrypt(res.data.phone) + this.name = this.$decrypt(res.data.name) this.birthday = res.data.birthday }).catch(res => { diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html index cdcf4ce..d15bd89 100644 --- a/ceres-uniapp-master/unpackage/dist/build/web/index.html +++ b/ceres-uniapp-master/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@