From 91f9659160533a98697e68687c9866230ec37837 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 19 Sep 2019 14:08:31 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=91=E6=8D=A2=E5=8A=9F=E8=83=BD]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 1 +
index/user.js | 1 +
index/user.wxml | 7 ++++
pages/exchange/exchange.js | 74 ++++++++++++++++++++++++++++++++++++
pages/exchange/exchange.json | 5 +++
pages/exchange/exchange.wxml | 5 +++
pages/exchange/exchange.wxss | 22 +++++++++++
utils/imgurl.js | 2 +-
8 files changed, 116 insertions(+), 1 deletion(-)
create mode 100644 pages/exchange/exchange.js
create mode 100644 pages/exchange/exchange.json
create mode 100644 pages/exchange/exchange.wxml
create mode 100644 pages/exchange/exchange.wxss
diff --git a/app.json b/app.json
index 1f53ff1..ec7732f 100644
--- a/app.json
+++ b/app.json
@@ -48,6 +48,7 @@
"pages/managelicenseplate/managelicenseplate",
"pages/payrule/payrule",
"pages/grade/grade",
+ "pages/exchange/exchange",
"pages/game/index",
"pages/canvas/index",
"pages/specialcourtesy/specialcourtesy",
diff --git a/index/user.js b/index/user.js
index d8f4700..0b5e748 100644
--- a/index/user.js
+++ b/index/user.js
@@ -20,6 +20,7 @@ Page({
editUrl: imgurl.edit.url,
activeUrl: imgurl.active.url,
dingUrl: imgurl.ding.url,
+ duihuan: imgurl.duihuan.url,
quansUrl: imgurl.quans.url,
wmintegral: imgurl.wmintegral.url,
cardiconUrl: imgurl.cardicon.url,
diff --git a/index/user.wxml b/index/user.wxml
index fe1bbec..d8865b3 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -85,6 +85,13 @@
我的活动
+
+
+
+
+ 兑换
+
+
diff --git a/pages/exchange/exchange.js b/pages/exchange/exchange.js
new file mode 100644
index 0000000..16d61ae
--- /dev/null
+++ b/pages/exchange/exchange.js
@@ -0,0 +1,74 @@
+const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px'
+const util = require("../../utils/util.js");
+const Http = require("../../utils/HttpBasics");
+const config = require("../../config/config");
+const imgurl = require("../../utils/imgurl");
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ navigationBarHeight
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ // 兑换
+ exchange(e){
+
+ }
+})
\ No newline at end of file
diff --git a/pages/exchange/exchange.json b/pages/exchange/exchange.json
new file mode 100644
index 0000000..88eeb8e
--- /dev/null
+++ b/pages/exchange/exchange.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "navbar": "../../components/navbar/navbar"
+ }
+}
\ No newline at end of file
diff --git a/pages/exchange/exchange.wxml b/pages/exchange/exchange.wxml
new file mode 100644
index 0000000..c3f2c0d
--- /dev/null
+++ b/pages/exchange/exchange.wxml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/exchange/exchange.wxss b/pages/exchange/exchange.wxss
new file mode 100644
index 0000000..dca9ba8
--- /dev/null
+++ b/pages/exchange/exchange.wxss
@@ -0,0 +1,22 @@
+/* pages/exchange/exchange.wxss */
+.section{
+ display: flex;
+ padding: 0 20rpx;
+ flex: 5;
+}
+.section input{
+ flex: 4;
+ border: 1px solid #ccc;
+ border-radius: 10rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ font-size: 30rpx;
+ padding-left: 20rpx;
+ margin-right: 10rpx;
+}
+.section button{
+ flex: 1;
+ height: 74rpx;
+ line-height: 74rpx;
+ font-size: 30rpx;
+}
\ No newline at end of file
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 2475d76..2376654 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -586,7 +586,7 @@ module.exports = {
'name': '拼团小图标'
},
'duihuan': {
- 'url': baseUrl + 'lqcduihuan1.png',
+ 'url': baseUrl + 'duihuan.png',
'name': '兑换小图标'
},
'wangmeimeibargin':{