diff --git a/app.json b/app.json index 79c9fa4..23d26ac 100644 --- a/app.json +++ b/app.json @@ -179,7 +179,11 @@ "pages/order/orderList/index", "pages/user/linkman/add/index", "pages/user/address/add/index", - "pages/user/linkman/index" + "pages/user/linkman/index", + "pages/user/userPrivacy/index", + "pages/user/personalInfo/index" + + ], "plugins": { "live-player-plugin": { diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index 5c4c8b1..e74532c 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -27,10 +27,10 @@ 演出 - + 电影 diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 827a635..43464b2 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -38,6 +38,10 @@ 12348 + + + 文化配送 + + + + + {{ title }} + + + {{ item.title }} + {{ item.des }} + > + + + + + + {{ item.title }} + + 使用目的 + {{ item.purpose }} + + + 使用场景 + {{ item.usage_scenarios }} + + + 收集情况 + {{ item.collect }} + + + + 信息内容 + {{item.information}} + + + + + \ No newline at end of file diff --git a/pages/user/personalInfo/index.wxss b/pages/user/personalInfo/index.wxss new file mode 100644 index 0000000..d10001b --- /dev/null +++ b/pages/user/personalInfo/index.wxss @@ -0,0 +1,73 @@ +page{ + background-color: rgb(242,242,242); + +} +.info{ + font-size: .6rem; + padding: 1.4rem .6rem 0 .6rem; +} +.title-header{ + background-color:#fff !important; + +} +.title-box{ + background-color:transparent !important; +} +.title { + color: #000; + + font-size: .8rem; + margin: .4rem 0; +} + +.item { + background: #fff; + font-size: .7rem; + padding: .8rem .8rem .4rem .8rem; + margin-top: .6rem; + position: relative; + border-radius: .6rem; + min-height: 4rem; +} + +.item-info { + color: #666; + margin: .4rem 0 .2rem 0; +} + +.item-icon { + position: absolute; + right: .2rem; + top: 50%; + font-family: cursive; + transform: translate(-.2rem, -.2rem); +} + +.info-content { + font-size: .7rem; + +} + +.info-list { + background: #fff; + font-size: .7rem; + padding: .2rem .8rem .4rem .8rem; + margin-top: .6rem; + border-radius: .6rem; + min-height: 4rem; +} + +.info-column { + display: flex; + align-items: flex-start; + margin-top: .4rem; +} + +.column-title { + color: #666; + white-space: nowrap; + margin-right: .2rem; +} +.green { + color: #0B898E; +} \ No newline at end of file diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js index 8ee49b6..c5a6465 100644 --- a/pages/user/service/list/index.js +++ b/pages/user/service/list/index.js @@ -86,7 +86,6 @@ Page({ }) }) }, - /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml index 10726a0..a398457 100644 --- a/pages/user/service/list/index.wxml +++ b/pages/user/service/list/index.wxml @@ -9,4 +9,5 @@ {{item.question_name}} -没找到想要的答案?一键呼唤人工客服 \ No newline at end of file + + diff --git a/pages/user/service/list/index.wxss b/pages/user/service/list/index.wxss index b81cefe..2775f59 100644 --- a/pages/user/service/list/index.wxss +++ b/pages/user/service/list/index.wxss @@ -47,8 +47,8 @@ } .more-btn { text-align: center; - width: 520rpx; - line-height: 60rpx; + width: 550rpx !important; + /* line-height: 60rpx; */ background: rgba(11, 137, 142, 0); border: 1rpx solid #D8D8D8; border-radius: 30rpx; diff --git a/pages/user/user.wxml b/pages/user/user.wxml index d808d7c..3e3cabb 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -88,5 +88,20 @@ 收货地址 + + + + 用户协议 + + + 隐私政策 + + + 个人信息收集清单 + + + 第三方共享信息清单 + + \ No newline at end of file diff --git a/pages/user/userPrivacy/index.js b/pages/user/userPrivacy/index.js new file mode 100644 index 0000000..8412a7d --- /dev/null +++ b/pages/user/userPrivacy/index.js @@ -0,0 +1,71 @@ +// pages/user/address/index.js +import user from "../../../utils/https/user.js" +import commonApi from "../../../utils/https/common" +import util from "../../../utils/util.js" +let app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + id:null, + info:"", + title:"", + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + id:options.id + }) + this.getInfo() + }, + getInfo:function(){ + commonApi._post("pbservice/Other/getDictionary", { id: this.data.id }).then(res => { + console.log(res); + res=res.data + this.setData({ + info:res[0].content, + title:res[0].type_name + }) + }) + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + } +}) \ No newline at end of file diff --git a/pages/user/userPrivacy/index.json b/pages/user/userPrivacy/index.json new file mode 100644 index 0000000..27b6d1f --- /dev/null +++ b/pages/user/userPrivacy/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "title-header": "/pages/component/TitleHeader" + } +} \ No newline at end of file diff --git a/pages/user/userPrivacy/index.wxml b/pages/user/userPrivacy/index.wxml new file mode 100644 index 0000000..2a73447 --- /dev/null +++ b/pages/user/userPrivacy/index.wxml @@ -0,0 +1,11 @@ + + + + {{title}} + + + {{info}} + + + + \ No newline at end of file diff --git a/pages/user/userPrivacy/index.wxss b/pages/user/userPrivacy/index.wxss new file mode 100644 index 0000000..99f3367 --- /dev/null +++ b/pages/user/userPrivacy/index.wxss @@ -0,0 +1,9 @@ +.title{ + padding: 10rpx 20rpx 0rpx 20rpx; + font-size: 28rpx; +} +.text{ + padding: 10rpx 20rpx 0rpx 20rpx; + font-size: 24rpx; + +} \ No newline at end of file