diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js
index 605d8d33c..f50b0d09a 100644
--- a/yudao-ui-app/config/app.js
+++ b/yudao-ui-app/config/app.js
@@ -1,7 +1,7 @@
-let domain = process.env.APP_BASE_URL
+// let domain = process.env.APP_BASE_URL
// let domain = 'http://192.168.1.188:48080'
-// let domain = 'http://api.cyywl.top'
+let domain = 'http://api.cyywl.top'
module.exports = {
// 请求域名 格式： https://您的域名
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 1c1429f56..0a328886d 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -15,6 +15,11 @@
"style": {
"navigationBarTitleText": "会员"
}
+ },{
+ "path": "pages/notice/index",
+ "style": {
+ "navigationBarTitleText": "公告详情"
+ }
},
{
"path": "pages/member_detail/index",
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 824f6ece6..219a9a2d3 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -4,14 +4,24 @@
@@ -204,7 +212,7 @@
bastInfo: '',
fastInfo: '',
fastList: [],
- text:'尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备',
+ text: '尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备',
firstInfo: '',
salesInfo: '',
indicatorDots: false,
@@ -319,13 +327,13 @@
// ]);
getUserInfo().then(res => {
this.userInfo = res.data
- getTenant(153).then(res=>{
+ getTenant(153).then(res => {
this.tenant = res.data
this.text = res.data.notice
})
})
- getHeader().then(res=>{
- console.log(res,'会员')
+ getHeader().then(res => {
+ console.log(res, '会员')
})
this.getBanners()
this.getIndexPage()
@@ -341,8 +349,12 @@
})
},
methods: {
- change(){
- console.log(this.value,'value')
+ // 跳转公告详情
+ goNoticeDetail() {
+ console.log('notice哇')
+ uni.navigateTo({
+ url: '/pages/notice/index'
+ })
},
// 搜索
searchSubmitValue: function() {
@@ -356,32 +368,32 @@
});
},
// 加入购物车
- addCart(id){
+ addCart(id) {
getSpuDetail(id).then(res => {
- console.log(res.data.productValue.默认.id,'1111111111111')
+ console.log(res.data.productValue.默认.id, '1111111111111')
let unique = res.data.productValue.默认.id
postCartAdd({
productId: id,
productAttrUnique: unique,
cartNum: 1
- }).then(res=> {
+ }).then(res => {
console.log('加入成功')
})
})
},
- go(){
- console.log(this.productList,'------')
+ go() {
+ console.log(this.productList, '------')
},
// 获取banner和userInfo
- getBanners(){
+ getBanners() {
// console.log(this.$store.tenantId,'tenantId')
- getBanner().then(res=>{
+ getBanner().then(res => {
this.bannerList = res.data.list[0]
- console.log(this.bannerList,'banner')
+ console.log(this.bannerList, 'banner')
})
- console.log(this.userInfo.userId,'userInfo111111')
+ console.log(this.userInfo.userId, 'userInfo111111')
},
getCoupon: function(id, index) {
@@ -497,12 +509,12 @@
})
},
// 首页商品
- getIndexPage(){
+ getIndexPage() {
let that = this
- productPage().then(res=>{
- console.log(res.data.list,'商品列表')
+ productPage().then(res => {
+ console.log(res.data.list, '商品列表')
this.productList = this.productList.concat(res.data.list)
- console.log(this.productList,'---------')
+ console.log(this.productList, '---------')
})
},
getcouponList() {
@@ -650,9 +662,9 @@
// 获取H5 搜索框高度
let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
appSearchH.boundingClientRect(function(data) {
- if(data){
- self.searchH = data.height
- }
+ if (data) {
+ self.searchH = data.height
+ }
}).exec()
// #endif
},
@@ -698,302 +710,338 @@
}
diff --git a/yudao-ui-app/pages/notice/index.vue b/yudao-ui-app/pages/notice/index.vue
new file mode 100644
index 000000000..782f84bae
--- /dev/null
+++ b/yudao-ui-app/pages/notice/index.vue
@@ -0,0 +1,50 @@
+
+
+
+ {{text}}
+
+
+
+
+
+
+
+