diff --git a/pages.json b/pages.json index 85ec147..747f1e4 100644 --- a/pages.json +++ b/pages.json @@ -287,13 +287,13 @@ { "path" : "sales/index", "style" : { - "navigationBarTitleText" : "不时不食" + "navigationBarTitleText" : "" } }, { "path" : "sales/indexs", "style" : { - "navigationBarTitleText" : "限时特惠" + "navigationBarTitleText" : "" } }, { @@ -355,6 +355,12 @@ "style": { "navigationBarTitleText" : "苏式月饼" } + }, + { + "path": "activity/greenOrganic", + "style": { + "navigationBarTitleText" : "绿色有机标准认证" + } } ] }], diff --git a/pages/user/user.vue b/pages/user/user.vue index f7c70bd..d604832 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -52,14 +52,14 @@ - + + + + + + @@ -137,8 +177,8 @@ isShow: true }, { - src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/lxwm.png', - title: '联系客服', + src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/lxkf.png', + title: '联系我们', path: '', isShow: true }, @@ -301,7 +341,7 @@ // }, gotoUrl(item, index) { if (index == 2) { - // this.$refs.popup.open() + this.$refs.kfpopup.open() return; } if (index == 4) { @@ -676,4 +716,92 @@ } } } + +/* 弹窗内容容器 */ +.kf-popup-content { + width: 100%; + background-color: #fff; + border-top-left-radius: 16px; + border-top-right-radius: 16px; + overflow: hidden; + .popup-header { + display: flex; + justify-content: center; + align-items: center; + padding: 16px; + position: relative; + border-bottom: 1px solid #f5f5f5; + } + .title { + font-size: 18px; + font-weight: bold; + } + + .close-icon { + position: absolute; + right: 16px; + font-size: 20px; + color: #999; + } + + /* 弹窗内容区 */ + .popup-body { + padding: 10px 0; + } + + /* 联系项样式 */ + .contact-item { + display: flex; + align-items: center; + padding: 16px 20px; + border-bottom: 1px solid #f5f5f5; + } + + + + .info { + flex: 1; + } + + .label { + font-size: 16px; + display: block; + margin-bottom: 4px; + } + + .detail { + font-size: 14px; + color: #666; + } + + .arrow { + width: 20px; + height: 20px; + color: #ccc; + font-size: 18px; + } +} + +.concat-btn{ + /* 清除默认背景和边框 */ + background: none; + border: none; + padding: 0; + margin: 0; + + /* 清除默认圆角 */ + border-radius: 0; + + /* 清除默认文字样式 */ + color: inherit; + font-size: inherit; + line-height: inherit; + + /* 清除点击效果(灰色背景) */ + -webkit-tap-highlight-color: transparent; + text-align: left; +} + + + \ No newline at end of file diff --git a/subPackages/activity/greenOrganic.vue b/subPackages/activity/greenOrganic.vue new file mode 100644 index 0000000..2a8fdb7 --- /dev/null +++ b/subPackages/activity/greenOrganic.vue @@ -0,0 +1,332 @@ + + + + + \ No newline at end of file diff --git a/subPackages/sales/index.vue b/subPackages/sales/index.vue index c3c2e12..d52e0ca 100644 --- a/subPackages/sales/index.vue +++ b/subPackages/sales/index.vue @@ -28,7 +28,7 @@ }, mounted() { // 头图 - this.getHeadImg(2374).then(res => {this.headImg = res}) + this.getHeadImg(2374) this.getList() }, onReachBottom() { @@ -37,6 +37,14 @@ },1000) }, methods: { + getHeadImg (id) { + this.Post({id},'/api/multimedia/detail').then(res => { + this.headImg = res.data.head_img + uni.setNavigationBarTitle({ + title:res.data.title + }) + }); + }, getList() { this.Post({ offset: this.list.length, diff --git a/subPackages/sales/indexs.vue b/subPackages/sales/indexs.vue index cd79cc1..f8a85bf 100644 --- a/subPackages/sales/indexs.vue +++ b/subPackages/sales/indexs.vue @@ -28,7 +28,7 @@ }, mounted() { // 头图 - this.getHeadImg(2375).then(res => {this.headImg = res}) + this.getHeadImg(2375) this.getList() }, onReachBottom() { @@ -37,6 +37,14 @@ },1000) }, methods: { + getHeadImg (id) { + this.Post({id},'/api/multimedia/detail').then(res => { + this.headImg = res.data.head_img + uni.setNavigationBarTitle({ + title:res.data.title + }) + }); + }, getList() { this.Post({ offset: this.list.length, diff --git a/subPackages/techan/cartOrder.vue b/subPackages/techan/cartOrder.vue index fd15253..a97c55a 100644 --- a/subPackages/techan/cartOrder.vue +++ b/subPackages/techan/cartOrder.vue @@ -430,6 +430,10 @@ export default { // 赋值全局地址 this.contacts = item + this.orderList.forEach(v=>{ + v.contacts = JSON.parse(JSON.stringify(this.contacts)) + }) + if (this.flag) { this.getPost(); diff --git a/subPackages/techan/cartOrder1.vue b/subPackages/techan/cartOrder1.vue index 470a975..c77bffd 100644 --- a/subPackages/techan/cartOrder1.vue +++ b/subPackages/techan/cartOrder1.vue @@ -423,6 +423,9 @@ export default { // 赋值全局地址 this.contacts = item + this.orderList.forEach(v=>{ + v.contacts = JSON.parse(JSON.stringify(this.contacts)) + }) if (this.flag) { this.getPost();