diff --git a/pages/index/index.json b/pages/index/index.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/index/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/log_in/log_in.js b/pages/log_in/log_in.js
deleted file mode 100644
index 0f3d362..0000000
--- a/pages/log_in/log_in.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/log_in/log_in.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/my_order/my_order.js b/pages/my_order/my_order.js
deleted file mode 100644
index dd14308..0000000
--- a/pages/my_order/my_order.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/my_order/my_order.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-switch_:["麻花官网","合作平台"]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/sign_out/sign_out.json b/pages/sign_out/sign_out.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/sign_out/sign_out.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/user/discount/discount_ex/discount_ex.js b/pages/user/discount/discount_ex/discount_ex.js
new file mode 100644
index 0000000..29d303a
--- /dev/null
+++ b/pages/user/discount/discount_ex/discount_ex.js
@@ -0,0 +1,133 @@
+// pages/user/discount/discount_ex/discount_ex.js
+import {
+  http
+} from '../../../../utils/util'
+import {
+  host
+} from '../../../../Gdata'
+Page({
+
+      /**
+       * 页面的初始数据
+       */
+      data: {
+        active: 0
+      },
+      ex(e) {
+        let token = getApp().globalData.token
+        let uid = getApp().globalData.uid
+        let url = ["/api/v1/coupon-exchange", "/api/v1/wenhui-exchange", "/api/v1/card-exchange"]
+        if(e.currentTarget.dataset.index == 2){
+          wx.request({
+            url: host + url[e.currentTarget.dataset.index],
+            data: {
+              card_sn: this.data.code
+            },
+            method: "post",
+            header: {
+              'token': token,
+              'uid': uid
+            },
+            success: res => {
+              if (200 == res.data.status) {
+                this.setData({code:null})
+                wx.showToast({
+                  title: "兑换成功",
+                  icon: "success",
+                  duration: 2000
+                })
+              } else {
+                wx.showToast({
+                  title: "兑换码错误",
+                  icon: 'error',
+                  duration: 2000
+                })
+              }
+            }
+          })
+        }else{
+          wx.request({
+            url: host + url[e.currentTarget.dataset.index],
+            data: {
+              coupon_sn: this.data.code
+            },
+            method: "post",
+            header: {
+              'token': token,
+              'uid': uid
+            },
+            success: res => {
+              if (200 == res.data.status) {
+                this.setData({code:null})
+                wx.showToast({
+                  title: "兑换成功",
+                  icon: "success",
+                  duration: 2000
+                })
+              } else {
+                wx.showToast({
+                  title: "兑换码错误",
+                  icon: 'error',
+                  duration: 2000
+                })
+              }
+            }
+          })
+        }
+      },
+          /**
+           * 生命周期函数--监听页面加载
+           */
+          onLoad: function (options) {
+
+          },
+
+          /**
+           * 生命周期函数--监听页面初次渲染完成
+           */
+          onReady: function () {
+
+          },
+
+          /**
+           * 生命周期函数--监听页面显示
+           */
+          onShow: function () {
+
+          },
+
+          /**
+           * 生命周期函数--监听页面隐藏
+           */
+          onHide: function () {
+
+          },
+
+          /**
+           * 生命周期函数--监听页面卸载
+           */
+          onUnload: function () {
+
+          },
+
+          /**
+           * 页面相关事件处理函数--监听用户下拉动作
+           */
+          onPullDownRefresh: function () {
+
+          },
+
+          /**
+           * 页面上拉触底事件的处理函数
+           */
+          onReachBottom: function () {
+
+          },
+
+          /**
+           * 用户点击右上角分享
+           */
+          onShareAppMessage: function () {
+
+          }
+        })
\ No newline at end of file
diff --git a/pages/user/user.json b/pages/user/user.json
deleted file mode 100644
index 9a13b7e..0000000
--- a/pages/user/user.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText":" shouye"
-}
\ No newline at end of file
diff --git a/pages/user/wallet/wallet/wallet.json b/pages/user/wallet/wallet/wallet.json
new file mode 100644
index 0000000..1d2b848
--- /dev/null
+++ b/pages/user/wallet/wallet/wallet.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"我的钱包"
+}
\ No newline at end of file