diff --git a/config/index.js b/config/index.js index 8cbb594..b14cf5c 100644 --- a/config/index.js +++ b/config/index.js @@ -1,8 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' -export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' -// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' +// export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' +export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/pages.json b/pages.json index a00494d..42c5513 100644 --- a/pages.json +++ b/pages.json @@ -24,6 +24,12 @@ "navigationBarTitleText": "注册" } }, + { + "path": "pages/webView/index", + "style": { + "navigationBarTitleText": "h5" + } + }, { "path": "pages/launch/index", diff --git a/pages/home/index.vue b/pages/home/index.vue index 3acf3a5..51ceace 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -49,7 +49,7 @@ - + 周公解梦 @@ -280,6 +280,12 @@ export default { }, methods: { ...mapActions(['getLocation']), + + // toWebView(){ + // uni.navigateTo({ + // url:'/pages/webView/index' + // }) + // }, setDate(t){ console.log() let str = t.split(" ")[0].split("-")[1] + "." + t.split(" ")[0].split("-")[2] @@ -306,7 +312,7 @@ export default { this.todayDate += (this.chinese[m.charAt(0)] + "月"); } //如果日为两位数,则返回十的月份拼接两次数据,其它则返回寻常的值 - console.log(d[d.length-1],'ddddddd') + // console.log(d[d.length-1],'ddddddd') if (d.length == 2) { if(d[d.length-1] == 0){ this.todayDate += (this.chinese[d.charAt(0)] + "十" + '日'); diff --git a/pages/knowledge/components/secondMenu.vue b/pages/knowledge/components/secondMenu.vue index 3131b86..5e2de51 100644 --- a/pages/knowledge/components/secondMenu.vue +++ b/pages/knowledge/components/secondMenu.vue @@ -60,6 +60,7 @@ border-radius: 14rpx; color: #222; margin-right: 24rpx; + margin-bottom: 12rpx; } .menu-item-active{ color: #EB5744; diff --git a/pages/webView/index.vue b/pages/webView/index.vue new file mode 100644 index 0000000..56223c5 --- /dev/null +++ b/pages/webView/index.vue @@ -0,0 +1,11 @@ + + + + +