diff --git a/app.json b/app.json index eca1053..42529a2 100644 --- a/app.json +++ b/app.json @@ -3,13 +3,28 @@ "pages/login/login", "pages/index/index", "pages/treaty/privacy/privacy", - "pages/treaty/service/service" + "pages/treaty/service/service", + "pages/mine/mine", + "pages/copyright/create/create", + "pages/copyright/createBuy/createBuy" ], "window": { "navigationBarTextStyle": "black", "navigationBarTitleText": "AI喵著", "navigationBarBackgroundColor": "#ffffff" }, + "tabBar": { + "list": [ + { + "pagePath": "pages/index/index", + "text": "首页" + }, + { + "pagePath": "pages/mine/mine", + "text": "我的" + } + ] + }, "style": "v2", "componentFramework": "glass-easel", "sitemapLocation": "sitemap.json", diff --git a/app.wxss b/app.wxss index db6116d..8c28c20 100644 --- a/app.wxss +++ b/app.wxss @@ -1,16 +1,31 @@ -/**app.wxss**/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; +/**自定义CheckBox**/ +page { + background-color: white; } +::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; +} + +/* 自定义导航栏容器 */ +.custom-navbar { + display: flex; + align-items: center; + padding-left: 16px; + padding-right: 16px; + background-color: #ffffff; + box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.05); +} + +/* 标题 */ +.navbar-title { + font-size: 18px; + font-weight: bold; + color: #000000; +} -/**自定义CheckBox**/ wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked { color: #fff !important; background-color: #3F72FF; @@ -37,4 +52,68 @@ wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before { font-size: 36rpx; } -/***End***/ \ No newline at end of file +/***End***/ + + + +.mt-10 { + margin-top: 10rpx; +} + +.mt-20 { + margin-top: 20rpx; +} + +.mr-10 { + margin-right: 10rpx; +} + +.ml-10 { + margin-left: 10rpx; +} + +.mb-10 { + margin-bottom: 10rpx; +} + +.mb-20 { + margin-bottom: 20rpx; +} + +.mt-40 { + margin-top: 40rpx; +} + +.mr-40 { + margin-right: 40rpx; +} + +.ml-40 { + margin-left: 40rpx; +} + +.mb-40 { + margin-bottom: 40rpx; +} + +.mg { + margin: 10rpx; +} + +.pd { + padding: 10rpx; +} + +.divider-v { + margin-top: 5rpx; + width: 90%; + height: 3rpx; + background-color: #F0F0F0; + align-self: center; +} + +.divider-v-100 { + height: 1rpx; + background-color: #F0F0F0; + width: 100%; +} \ No newline at end of file diff --git a/net/api/commonApi.js b/net/api/commonApi.js index f506b45..31f38b7 100644 --- a/net/api/commonApi.js +++ b/net/api/commonApi.js @@ -1,18 +1,28 @@ import { request } from "../http"; - -// 管理地址 +// 公共API const apiPath = { investDetail: "/news-content/listpage?rows=1&page=1", //投资优势 - servicePrivacy: "app/agreementportal/getrelease/93679af4-e264-4d1c-bd49-538028daa95d" + doGetDealPrivacy: "/app/agreementportal/getrelease/", + serivceId: "68eee8f5-33d3-4246-aeee-a33956677101", //服务协议 + privacyId: "93679af4-e264-4d1c-bd49-538028daa95d" //隐私条款 } class CommonService { static doGetInvestDetail(data) { return request(apiPath.investDetail, "GET", data) } - static doGetServicePrivacy() { - return request(apiPath.servicePrivacy, "GET", null) + static doGetPrivacy(data) { + var id = "" + switch (data) { + case "privacy": + id = apiPath.privacyId + break; + case "service": + id = apiPath.serivceId + break; + } + return request(apiPath.doGetDealPrivacy + id, "GET", null) } } diff --git a/net/http.js b/net/http.js index f521858..a0ccbaa 100644 --- a/net/http.js +++ b/net/http.js @@ -1,6 +1,6 @@ // 定义api服务地址 -const baseUrl = 'https://www.xzszwhy.cn/daqi/app'; -// const baseUrl = 'http://106.74.34.136:8084/daqi/app'; +// const baseUrl = 'https://www.xzszwhy.cn/daqi/app'; +const baseUrl = 'https://www.aimzhu.com/operator'; /** * 传入请求参数,返回Promise支持链试调用 * @param url 请求地址 diff --git a/pages/copyright/create/create.js b/pages/copyright/create/create.js new file mode 100644 index 0000000..9655709 --- /dev/null +++ b/pages/copyright/create/create.js @@ -0,0 +1,66 @@ +// pages/copyright/create/create.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/copyright/create/create.wxml b/pages/copyright/create/create.wxml new file mode 100644 index 0000000..66cc402 --- /dev/null +++ b/pages/copyright/create/create.wxml @@ -0,0 +1,2 @@ + +pages/copyright/create/create.wxml \ No newline at end of file diff --git a/pages/copyright/createBuy/createBuy.js b/pages/copyright/createBuy/createBuy.js new file mode 100644 index 0000000..8034ca4 --- /dev/null +++ b/pages/copyright/createBuy/createBuy.js @@ -0,0 +1,19 @@ +// pages/copyright/createBuy/createBuy.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '创建项目', + }) + }, +}) \ No newline at end of file diff --git a/pages/copyright/createBuy/createBuy.json b/pages/copyright/createBuy/createBuy.json new file mode 100644 index 0000000..3928faa --- /dev/null +++ b/pages/copyright/createBuy/createBuy.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/copyright/createBuy/createBuy.wxml b/pages/copyright/createBuy/createBuy.wxml new file mode 100644 index 0000000..a2fb13e --- /dev/null +++ b/pages/copyright/createBuy/createBuy.wxml @@ -0,0 +1,30 @@ + + + + + + 全托管 + 购买 + + + 从下单到取证,仅需提供基本信息,我们为您提供一站式管家服务. + 提供的服务 + + 包可运行软件开发与搭建 + 包鉴别材料撰写 + + + 包代办,包下证,包开发票提 + 供可运行软件安装包 + + + + + 提供可运行软件云服务900天 + + 提供可运行软件演示视频 + + 客服一对一服务 + + + \ No newline at end of file diff --git a/pages/copyright/createBuy/createBuy.wxss b/pages/copyright/createBuy/createBuy.wxss new file mode 100644 index 0000000..de6e29d --- /dev/null +++ b/pages/copyright/createBuy/createBuy.wxss @@ -0,0 +1,70 @@ +/* pages/copyright/createBuy/createBuy.wxss */ +page { + background-color: gray; +} + +.buy-container { + display: flex; + flex-direction: column; + padding: 20rpx; +} + +.buy-title { + height: 100rpx; + background-color: blanchedalmond; +} + +.buy-all-box { + margin-top: 20rpx; + display: flex; + flex-direction: column; + padding: 20rpx; + border-radius: 10rpx; + background-color: white; +} + +.buy-all-title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.buy-all-txt { + font-size: 42rpx; + color: black; + font-weight: 500; +} + +.buy-all-btn { + padding: 5rpx 20rpx; + background-color: gray; +} + +.buy-desc-box { + display: flex; + flex-direction: column; +} + +.buy-desc-txt { + font-size: 28rpx; + color: #3b3b3b; +} + +.buy-desc-title { + font-size: 28rpx; + color: #3b3b3b; +} + +.buy-desc-item { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.buy-desc-row { + display: flex; + flex-direction: row; + font-size: 28rpx; + align-items: center; +} \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.js b/pages/copyright/createProjectInfo/createProjectInfo.js new file mode 100644 index 0000000..78c7732 --- /dev/null +++ b/pages/copyright/createProjectInfo/createProjectInfo.js @@ -0,0 +1,23 @@ +const utils = require("../../../utils/util") +Page({ + data: { + items: ['项目 1', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 2', '项目 3', '项目 4', '项目 5', '项目 6', '项目 7', '项目 8', '项目 9', '项目 10'], + date: utils.formatDate(new Date()), + completeDate: utils.formatDate(new Date()), //开发完成时间 + version: "v1.0", //系统版本 + }, + //系统版本 + inputVersion(e) { + console.log(e.detail.value) + this.setData({ + version: e.detail.value + }) + }, + //开发完成时间 + bindDateChange(e) { + console.log(e) + this.setData({ + completeDate: e.detail.value + }) + } +}) \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.json b/pages/copyright/createProjectInfo/createProjectInfo.json new file mode 100644 index 0000000..fc9d7fc --- /dev/null +++ b/pages/copyright/createProjectInfo/createProjectInfo.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {} + +} \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml new file mode 100644 index 0000000..ceec79c --- /dev/null +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -0,0 +1,47 @@ + + + + 项目信息 + + 推荐 + + + + + + 产权所属者 + + + + 产权联系人 + + + + 系统版本 + + 系统语言 + JAVA + 选择 + + + 开发完成时间 + + {{completeDate}} + + + + + + + + 套餐包 + 暂无套餐包 + + + 优惠券 + 请选择优惠券 + 选择 + + + + \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss new file mode 100644 index 0000000..f60d870 --- /dev/null +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -0,0 +1,74 @@ +.create-container { + display: flex; + flex-direction: column; + justify-content: flex-start; + padding: 20rpx; +} + +.create-title { + height: 80rpx; + background-color: blanchedalmond; +} + +.info-box { + display: flex; + flex-direction: column; + margin-top: 20rpx; +} + +.info-title { + font-size: 30rpx; + font-weight: 500; +} + +.info-value { + margin-top: 10rpx; + border: 1rpx solid black; + padding: 20rpx; + font-size: 28rpx; +} + +.info-btn { + align-self: flex-end; + background-color: #f2f2f2; + margin-top: 10rpx; + padding: 10rpx 40rpx; + border-radius: 10rpx; +} + +.content-box { + margin-top: 20rpx; +} + +.section { + border: 1px solid #ccc; + border-radius: 5rpx; + padding: 15rpx; + margin-bottom: 15rpx; +} + +.item { + display: flex; + align-items: center; + margin-bottom: 10rpx; + padding: 20rpx 10rpx; + font-size: 28rpx; +} + +.label { + color: black; +} + +.desc { + flex: 1; + color: #999; + text-align: right; +} + +.value { + color: #666; +} + +.link { + color: #007AFF; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 33faa1a..2b49396 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,26 +1,27 @@ // index.js -import format from "../../utils/format" const app = getApp() +const systemInfo = wx.getWindowInfo(); +const statusBarHeight = systemInfo.statusBarHeight; // 状态栏高度 +const navBarHeight = 44; // 导航栏高度(iOS 为 44px,Android 为 48px) +const windowHeight = systemInfo.windowHeight - navBarHeight - statusBarHeight; //可用内容高度 Page({ data: { - motto: 'Hello World', - userInfo: { - avatarUrl: '', - nickName: '', - }, - isAdPopupVisible: false, - adImageUrl: '' + statusBarHeight: statusBarHeight, + navBarHeight: navBarHeight, + totalHeight: navBarHeight, // 导航栏总高度 + contentHeight: windowHeight, + tabList: ["写材料", "全托管", "安装包", "演示视频", "加急", "提交版权中心", "已经下证"], + currentTab: "写材料" }, onLoad(e) { - console.log(app) - this.setData({ - adImageUrl: app.globalData.adImageUrl, - isAdPopupVisible: app.globalData.isAdPopupVisible + const info = wx.getWindowInfo() + const h = info.windowHeight - navBarHeight - statusBarHeight + console.log(h) + }, + printInfo() {}, + createCopy() { + wx.navigateTo({ + url: '/pages/copyright/createBuy/createBuy', }) - }, - printInfo() { - app.showAdPopup("https://ts1.tc.mm.bing.net/th/id/R-C.d88442788ee5a458d50e40f0a8cb1e05?rik=EoPp8GhejYeQfw&riu=http%3a%2f%2fimg.pconline.com.cn%2fimages%2fupload%2fupc%2ftx%2fwallpaper%2f1307%2f10%2fc2%2f23151595_1373424485102.jpg&ehk=J7xq%2f50bCmdD4jUXfnTlau2s5WiVsBxQArAjvJzqIo4%3d&risl=&pid=ImgRaw&r=0") - // const num = format.formatQuantity(19952) - // console.log(num) - }, + } }) \ No newline at end of file diff --git a/pages/index/index.json b/pages/index/index.json index b55b5a2..7af8b0a 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,4 +1,4 @@ { - "usingComponents": { - } + "usingComponents": {}, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 26bb97b..17871e8 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,7 +1,140 @@ - - - - + + AI喵著 + + + + + + + + 创建软著 + + 充值 + + 通知:你的软著已下证 + + + 软著列表 + + 进行中的 + 已完成的 + + + + + + + {{item}} + + + + + - - \ No newline at end of file + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + 状态 + + + + 项目名称 + 状态 + + 版权所属人 + + 创建时间 + 下载 + + + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1ebed4b..ccbfdfe 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,62 +1,204 @@ -/**index.wxss**/ -page { - height: 100vh; - display: flex; - flex-direction: column; -} -.scrollarea { - flex: 1; - overflow-y: hidden; + + +.content-box { + display: flex; + flex-direction: column; + padding: 20rpx; } -.userinfo { - display: flex; - flex-direction: column; - align-items: center; - color: #aaa; - width: 80%; +.container-title { + display: flex; + flex-direction: column; + height: 170px; } -.userinfo-avatar { - overflow: hidden; - width: 128rpx; - height: 128rpx; - margin: 20rpx; - border-radius: 50%; +.title-func { + display: flex; + flex-direction: row; } -.usermotto { - margin-top: 200px; +.create-btn { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + flex: 2; + background-color: greenyellow; } -.avatar-wrapper { - padding: 0; - width: 56px !important; - border-radius: 8px; - margin-top: 40px; - margin-bottom: 40px; +.buy-btn { + background-color: green; + flex: 1; + margin-left: 20rpx; + height: 100rpx; + justify-content: center; + align-items: center; + text-align: center; + line-height: 100rpx; } -.avatar { - display: block; - width: 56px; - height: 56px; +.notice-box { + font-size: 26rpx; + background-color: lavender; + margin-top: 20rpx; + line-height: 60rpx; + padding: 10rpx 10rpx 10rpx 20rpx; } -.nickname-wrapper { - display: flex; - width: 100%; - padding: 16px; - box-sizing: border-box; - border-top: .5px solid rgba(0, 0, 0, 0.1); - border-bottom: .5px solid rgba(0, 0, 0, 0.1); - color: black; +.container-box { + display: flex; + flex-direction: column; + margin-top: 20rpx; } -.nickname-label { - width: 105px; +.list-title-box { + display: flex; + flex-direction: row; + justify-content: space-between; } -.nickname-input { - flex: 1; +.list-title-txt { + font-size: 30rpx; + color: black; } + +.list-title-btns { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.list-tabs { + display: flex; + flex-direction: row; + flex-wrap: nowrap; +} + +.tab-select { + font-size: 20rpx; + color: white; + background-color: #256742; + text-align: center; + background: #256742; + padding: 5rpx 15rpx; + white-space: nowrap; +} + +.item-margin { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.item-margin:nth-of-type(n+2) { + margin-left: 20rpx; +} + +.tab-normal { + font-size: 20rpx; + color: #3F3F3F; + background: #EAEAEA; + text-align: center; + padding: 5rpx 30rpx; + white-space: nowrap; +} + +/* list */ +.list-content { + display: flex; + flex-direction: column; + justify-content: flex-start; + margin-top: 20rpx; +} + +.list-item { + display: flex; + flex-direction: row; + justify-content: space-between; + background-color: #f7f7f7; + border-radius: 10rpx; +} + +.list-item:nth-of-type(n+2) { + margin-top: 20rpx; +} + +.item-img { + display: flex; + flex-direction: column; + justify-content: center; + position: relative; +} + +.item-img image { + width: 270rpx; + height: 200rpx; +} + +.item-img-status { + background-color: #9A9A9A; + text-align: center; + position: absolute; + bottom: 0; + left: 0; + width: 270rpx; +} + +.item-content { + display: flex; + flex-direction: column; + justify-content: space-between; + flex: 1; + padding: 10rpx 20rpx; +} + +.item-content-title { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.project-name { + font-size: 30rpx; + color: black; + font-weight: 500; +} + +.project-status { + font-size: 30rpx; + color: black; + font-weight: 200; +} + +.item-content-title { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.project-aff { + display: flex; + flex-direction: column; + justify-content: flex-start; + font-size: 24rpx; +} + +.project-btns { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.project-create-time { + font-size: 26rpx; +} + +.project-btn { + font-size: 24rpx; + background-color: #929292; + color: white; + padding: 5rpx 20rpx 5rpx 20rpx; + border-radius: 5rpx; +} \ No newline at end of file diff --git a/pages/login/login.js b/pages/login/login.js index bc79b5e..0119c96 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -37,20 +37,34 @@ Page({ }); }, doGetPhoneNumber(e) { - if (e.detail.errMsg === 'getPhoneNumber:ok') { - // 用户同意授权 - const { - encryptedData, - iv - } = e.detail; - console.log('encryptedData:', encryptedData); - console.log('iv:', iv); - //通过后台获取手机号 - //弹窗获取授权用户昵称 - } else { - // 用户拒绝授权 - console.log('用户拒绝授权'); - } + wx.switchTab({ + url: '/pages/index/index' + }); + // wx.navigateBack({ + // delta: 1, + // success: function () { + // wx.switchTab({ + // url: '/pages/index/index' + // }); + // }, + // error: (res) => { + // console.log(res) + // } + // }); + // if (e.detail.errMsg === 'getPhoneNumber:ok') { + // // 用户同意授权 + // const { + // encryptedData, + // iv + // } = e.detail; + // console.log('encryptedData:', encryptedData); + // console.log('iv:', iv); + // //通过后台获取手机号 + // //弹窗获取授权用户昵称 + // } else { + // // 用户拒绝授权 + // console.log('用户拒绝授权'); + // } }, doGetUserInfo() { wx.getUserProfile({ @@ -59,5 +73,8 @@ Page({ } }) + }, + onUnload() { + console.log('login卸载') } }) \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 711e155..67a72a8 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -14,6 +14,7 @@ 《隐私条款》 - + + \ No newline at end of file diff --git a/pages/mine/mine.js b/pages/mine/mine.js new file mode 100644 index 0000000..682ab0d --- /dev/null +++ b/pages/mine/mine.js @@ -0,0 +1,44 @@ +// pages/mine/mine.js +const app = getApp() +const systemInfo = wx.getWindowInfo(); +const statusBarHeight = systemInfo.statusBarHeight; // 状态栏高度 +const navBarHeight = 44; // 导航栏高度(iOS 为 44px,Android 为 48px) +const windowHeight = systemInfo.windowHeight - navBarHeight - statusBarHeight; //可用内容高度 +Page({ + + /** + * 页面的初始数据 + */ + data: { + statusBarHeight: statusBarHeight, + navBarHeight: navBarHeight, + totalHeight: navBarHeight, // 导航栏总高度 + contentHeight: windowHeight, + menuList: [{ + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "个人信息" + }, { + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "修改密码" + }, { + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "我的订单" + }, { + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "发票管理" + }, { + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "产权所属人" + }, { + "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", + "title": "产权联系人" + }] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, +}) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json new file mode 100644 index 0000000..7af8b0a --- /dev/null +++ b/pages/mine/mine.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml new file mode 100644 index 0000000..5c7348a --- /dev/null +++ b/pages/mine/mine.wxml @@ -0,0 +1,31 @@ + + AI喵著 + + + + + + + 2022 + + + 充值 + + 账户余额 + + + 套餐包余额 + + 全托管0 + 写材料100 + 优惠卷 + + + + + + + {{item.title}} + + + \ No newline at end of file diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss new file mode 100644 index 0000000..9cafcf0 --- /dev/null +++ b/pages/mine/mine.wxss @@ -0,0 +1,99 @@ +/* pages/mine/mine.wxss */ +.container-content { + padding: 20rpx; +} + +.container-box { + display: flex; + flex-direction: column; +} + +.box-up { + display: flex; + flex-direction: column; + background-color: #FFD100; + padding: 40rpx; + color: white; + border-top-right-radius: 20rpx; + border-top-left-radius: 20rpx; +} + +.balance-box { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.balance-btn { + padding: 10rpx 20rpx; + background-color: yellowgreen; + border-radius: 10rpx; +} + +.balance-desc { + font-size: 24rpx; + margin-top: 10rpx; + font-weight: 400; +} + +.balance { + display: flex; + flex-direction: row; + align-items: center; + font-size: 48rpx; + font-weight: 600; +} + +.box-down { + display: flex; + flex-direction: column; + background: linear-gradient(to right, #FFE880, #FFD30A); + padding: 40rpx; + color: white; + border-bottom-right-radius: 20rpx; + border-bottom-left-radius: 20rpx; +} + +.arrow-down { + width: 0; + height: 0; + margin-left: 30rpx; + border-top: 14rpx solid transparent; + border-bottom: 14rpx solid transparent; + border-left: 14rpx solid white; +} + +.package-bag { + margin-top: 20rpx; + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.menu-box { + display: flex; + flex-direction: column; + margin-top: 30rpx; +} + +.menu-item { + display: flex; + flex-direction: row; + padding: 30rpx 40rpx; + align-items: center; + border-bottom: 1rpx solid rgb(238, 238, 238); + margin-left: 20rpx; + margin-right: 20rpx; +} + +.menu-icon { + width: 48rpx; + height: 48rpx; +} + +.menu-title { + font-size: 28rpx; + color: black; + margin-left: 20rpx; +} \ No newline at end of file diff --git a/pages/treaty/privacy/privacy.js b/pages/treaty/privacy/privacy.js index 1da32d0..7e4be4a 100644 --- a/pages/treaty/privacy/privacy.js +++ b/pages/treaty/privacy/privacy.js @@ -1,66 +1,37 @@ -// pages/treaty/privacy/privacy.js +// pages/treaty/service/service.js +import CommonService from "../../../net/api/commonApi" Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { + content: "", + title: '' + }, - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getDeal() + }, + //获取协议内容 + getDeal() { + var _self = this + CommonService.doGetPrivacy("privacy") + .then(res => { + if (res.content) { + _self.setData({ + content: res.content, + title: res.title + }) + wx.setNavigationBarTitle({ + title: res.title, + }) + } + }, err => { + console.log(err) + }) + } }) \ No newline at end of file diff --git a/pages/treaty/privacy/privacy.wxml b/pages/treaty/privacy/privacy.wxml index 2104826..006e24b 100644 --- a/pages/treaty/privacy/privacy.wxml +++ b/pages/treaty/privacy/privacy.wxml @@ -1 +1,4 @@ - \ No newline at end of file + + {{title}} + + \ No newline at end of file diff --git a/pages/treaty/privacy/privacy.wxss b/pages/treaty/privacy/privacy.wxss index ecd4d97..ebe3c52 100644 --- a/pages/treaty/privacy/privacy.wxss +++ b/pages/treaty/privacy/privacy.wxss @@ -1 +1,21 @@ -/* pages/treaty/privacy/privacy.wxss */ \ No newline at end of file +/* pages/treaty/privacy/privacy.wxss */ +.content-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 20rpx; +} + +.content-title { + font-size: 28rpx; + font-weight: 500; + color: black; +} + +.content-body { + font-size: 24rpx; + color: gray; + margin-top: 20rpx; + padding: 20rpx; +} \ No newline at end of file diff --git a/pages/treaty/service/service.js b/pages/treaty/service/service.js index 08d269d..fd5fea8 100644 --- a/pages/treaty/service/service.js +++ b/pages/treaty/service/service.js @@ -1,66 +1,37 @@ // pages/treaty/service/service.js +import CommonService from "../../../net/api/commonApi" Page({ - /** - * 页面的初始数据 - */ - data: { + /** + * 页面的初始数据 + */ + data: { + content: "", + title: '' + }, - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getDeal() + }, + //获取协议内容 + getDeal() { + var _self = this + CommonService.doGetPrivacy("service") + .then(res => { + if (res.content) { + _self.setData({ + content: res.content, + title: res.title + }) + wx.setNavigationBarTitle({ + title: res.title, + }) + } + }, err => { + console.log(err) + }) + } }) \ No newline at end of file diff --git a/pages/treaty/service/service.wxml b/pages/treaty/service/service.wxml index bcf2d75..006e24b 100644 --- a/pages/treaty/service/service.wxml +++ b/pages/treaty/service/service.wxml @@ -1 +1,4 @@ - \ No newline at end of file + + {{title}} + + \ No newline at end of file diff --git a/pages/treaty/service/service.wxss b/pages/treaty/service/service.wxss index a0af57d..ebe3c52 100644 --- a/pages/treaty/service/service.wxss +++ b/pages/treaty/service/service.wxss @@ -1 +1,21 @@ -/* pages/treaty/service/service.wxss */ \ No newline at end of file +/* pages/treaty/privacy/privacy.wxss */ +.content-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 20rpx; +} + +.content-title { + font-size: 28rpx; + font-weight: 500; + color: black; +} + +.content-body { + font-size: 24rpx; + color: gray; + margin-top: 20rpx; + padding: 20rpx; +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 9309aeb..03f55da 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -5,5 +5,5 @@ "compileHotReLoad": true, "urlCheck": false }, - "libVersion": "3.7.10" + "libVersion": "3.6.6" } \ No newline at end of file diff --git a/static/images/ic_check_fit.png b/static/images/ic_check_fit.png new file mode 100644 index 0000000..7b9e544 Binary files /dev/null and b/static/images/ic_check_fit.png differ