commit ebb9575bd01c4d7fb08a52abe01722f86daa96dc
Author: zhangjing <zhangjing@uztech.com>
Date:   Wed Jun 21 17:19:58 2023 +0800

    [本时生活h5端]

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38adffa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..07c1d5f
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..ebe72e8
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,123 @@
+<script>
+    
+    var QQMapWX = require("./utils/qqmap-wx-jssdk.min.js");
+    var qqmapsdk;
+    
+    import { config } from '@/apis/interfaces/wxJSDK'
+	export default {
+		onLaunch() {
+		    // config({
+		    //     list    : ["requestPayment", "updateAppMessageShareData"],
+		    //     url     : location.href.split('#')[0]
+		    // }).then(res=>{
+		    //     this.$wx.config(res)
+		    // })
+            
+            this.qqmapsdk = new QQMapWX({
+                key: '4KYBZ-LCAKF-QWOJN-NIDNZ-FZHLZ-2XFW7'
+            }); // 版本更新提示
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		},
+        globalData:{
+            envType : '',
+            shareObj : {
+                type    : '',
+                goodsId : '',
+                userId  : ''
+            }
+        }
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+    page {
+        background-color: #f3f3f3;    
+    }
+    
+    /* 文字截取 */
+    .nowrap {
+    	max-width: 100%;
+    	overflow: hidden;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+    }
+    
+    .nowrap-multi {
+    	display: -webkit-box;
+    	overflow: hidden;
+    	text-overflow: ellipsis;
+    	-webkit-box-orient: vertical;
+    	-webkit-line-clamp: 2;
+    }
+    
+    /* 水平居中 */
+    .pack-center {
+    	display: -webkit-box;
+    	-webkit-box-orient: vertical;
+    	-webkit-box-pack: center;
+    	position: absolute;
+    	left: 0;
+    	right: 0;
+    	top: 0;
+    	bottom: 0;
+    	z-index: -1;
+    }
+    
+    /* 页面信息提醒 */
+    .pages-hint {
+    	text-align: center;
+    	color: #747788;
+    	font-size: 28rpx;
+    	background: white;
+    }
+    
+    .pages-hint image {
+    	width: 188rpx;
+    	height: 188rpx;
+    }
+    
+    /* 上拉加载 */
+    .pagesLoding{
+        text-align: center;
+        line-height: 90rpx;
+        color: gray;
+    }
+    
+    .pagesLoding-icon{
+        width: 28rpx;
+        height: 28rpx;
+        vertical-align: middle;
+        margin-right: 10rpx;
+        margin-bottom: 3rpx;
+    }
+    
+    /* 下边框 */
+    .uni-border-top,
+    .uni-border-bottom {
+    	position: relative;
+    }
+    
+    .uni-border-top::after,
+    .uni-border-bottom::after {
+    	position: absolute;
+    	content: '';
+    	left: 0;
+    	width: 100%;
+    	height: 2rpx;
+    	background: #f3f3f3;
+    }
+    
+    .uni-border-top::after {
+    	top: 0;
+    }
+    
+    .uni-border-bottom::after {
+    	bottom: 0;
+    }
+</style>
diff --git a/apis/interfaces/address.js b/apis/interfaces/address.js
new file mode 100644
index 0000000..1252320
--- /dev/null
+++ b/apis/interfaces/address.js
@@ -0,0 +1,83 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 我的地址列表
+const index = () => {
+    return request({
+        url : 'addresses'
+    })
+}
+
+// 删除地址
+const remove = (addressId) => {
+    return request({
+        url : 'addresses/' + addressId + '/destroy',
+        method: "DELETE"
+    })
+}
+
+// 删除地址
+const setdef = (addressId) => {
+    return request({
+        url : 'addresses/' + addressId + '/setdef',
+        method: "POST"
+    })
+}
+
+// 获取省
+const create = () => {
+    return request({
+        url : 'addresses/create'
+    })
+}
+
+// 获取市级列表
+const children = (psn) => {
+    return request({
+        url : 'areas/children',
+        data: {
+            psn
+        }
+    })
+}
+
+// 创建地址保存
+const add = (data) => {
+    return request({
+        url : 'addresses/store',
+        method: "POST",
+        data: data
+    })
+}
+
+// 编辑地址保存
+const keep = (addressId, data) => {
+    return request({
+        url : 'addresses/' + addressId + '/update',
+        method: "POST",
+        data: data
+    })
+}
+
+// 获取已有地址信息
+const edit = (addressId) => {
+    return request({
+        url : 'addresses/' + addressId + '/edit'
+    })
+}
+
+export {
+    index,
+    remove,
+    setdef,
+    create,
+    children,
+    add,
+    keep,
+    edit
+}
\ No newline at end of file
diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js
new file mode 100644
index 0000000..f39f854
--- /dev/null
+++ b/apis/interfaces/auth.js
@@ -0,0 +1,69 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+// 手机号+验证码登录
+const auth = (data) => {
+	return request({
+		url: 'auth/login_by_code',
+		method: 'POST',
+        data: data
+	})
+}
+
+// 设置登录密码
+const passSetup = (data) => {
+	return request({
+		url: 'auth/reset_password',
+		method: 'POST',
+		data: data
+	})
+}
+
+// 手机号+密码登录
+const passlogin = (data) => {
+	return request({
+		url: 'auth/login_by_password',
+		method: 'POST',
+		data: data
+	})
+}
+
+// 注册
+const register = (data) => {
+	return request({
+		url: 'auth/register',
+		method: 'POST',
+		data: data
+	})
+}
+
+// 领取红包-发送短信-获取验证码
+const send = (data) => {
+	return request({
+		url: 'sms/send',
+		method: 'POST',
+		data: data
+	})
+}
+
+// 领取红包-领取
+const unicom = (data) => {
+	return request({
+		url: 'unicom/get',
+		method: 'POST',
+		data: data
+	})
+}
+
+export {
+	auth,
+    passSetup,
+    passlogin,
+	register,
+    send,
+    unicom
+}
diff --git a/apis/interfaces/campus.js b/apis/interfaces/campus.js
new file mode 100644
index 0000000..97ac606
--- /dev/null
+++ b/apis/interfaces/campus.js
@@ -0,0 +1,95 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+const index = (data) => {
+	return request({
+		url: 'schools'
+	})
+}
+
+//卡券二维码
+const qrcode = (coupon_id) => {
+	return request({
+		url: 'coupons/qrcode',
+        data: {
+            coupon_id
+        }
+	})
+}
+
+//门店列表
+const barcode = (coupon_id) => {
+	return request({
+		url: "coupons/" + coupon_id + '/barcode'
+	})
+}
+
+//卡券二维码
+const couponinfo = (data) => {
+	return request({
+		url: "coupons/show",
+		data: data
+	})
+}
+
+// 获取商家券信息
+const merchantCard = (coupon_id) => {
+	return request({
+		url: "coupons/merchant_card",
+		method: "GET",
+		data: {
+		    coupon_id
+		}
+	})
+}
+
+// 校园活动确认订单
+const buy = (data) => {
+	return request({
+		url : "schools/buy",
+		data: data
+	})
+}
+
+// 校园活动提交订单
+const buySubmit = (data) => {
+	return request({
+		url     : "schools/buy",
+		method  : "POST",
+		data    : data
+	})
+}
+
+// 卡券分组
+const coupon = (data) => {
+	return request({
+		url     : "coupons",
+		data    : data
+	})
+}
+
+// 卡券分组
+const breakCode = (coupon_id) => {
+	return request({
+		url     : "coupons/qrcode",
+		data: {
+		    coupon_id
+		}
+	})
+}
+
+export {
+	index,
+    qrcode,
+    barcode,
+    couponinfo,
+    merchantCard,
+    buy,
+    buySubmit,
+    coupon,
+    breakCode
+}
diff --git a/apis/interfaces/draw.js b/apis/interfaces/draw.js
new file mode 100644
index 0000000..79edb7a
--- /dev/null
+++ b/apis/interfaces/draw.js
@@ -0,0 +1,79 @@
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ * 抽奖活动
+ */
+import request from '../request'
+
+// 首页
+const index = (data) => {
+	return request({
+		url: 'activity/exchanges'
+	})
+}
+
+// 抽奖
+const result = (exchange_id) => {
+	return request({
+		url: 'activity/exchanges/' + exchange_id + '/draw'
+	})
+}
+
+// 抽奖默认信息（抽奖次数）
+const awards = (exchange_id, data) => {
+	return request({
+		url: 'activity/exchanges/' + exchange_id + "/awards",
+        data: data
+	})
+}
+
+// 我的订单
+const orders = (data) => {
+	return request({
+		url: 'activity/exchanges/orders',
+        data: data
+	})
+}
+
+// 我的优惠券
+const coupons = (data) => {
+	return request({
+		url: 'activity/exchanges/coupons',
+        data: data
+	})
+}
+
+// 产品选择
+const exchanges = (log_id) => {
+	return request({
+		url: 'activity/exchanges/log/' + log_id
+	})
+}
+
+// 兑换产品
+const exchangesBuy = (data) => {
+	return request({
+		url: 'activity/exchanges/buy',
+        method: 'POST',
+        data: data
+	})
+}
+
+// 兑换产品
+const activityBuy = (data) => {
+	return request({
+		url: 'activity/exchanges/buy',
+        data: data
+	})
+}
+
+export {
+	index,
+    result,
+    awards,
+    orders,
+    coupons,
+    exchanges,
+    exchangesBuy,
+    activityBuy
+}
\ No newline at end of file
diff --git a/apis/interfaces/giftPack.js b/apis/interfaces/giftPack.js
new file mode 100644
index 0000000..be94cad
--- /dev/null
+++ b/apis/interfaces/giftPack.js
@@ -0,0 +1,78 @@
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+// 月兑活动 - 首页
+const index = (data) => {
+	return request({
+		url: 'months'
+	})
+}
+
+// 月兑活动 - 商品详情
+const details = (month_id) => {
+	return request({
+		url : "months/" + month_id
+	})
+}
+
+// 月兑活动 - 确认订单
+const buy = (data) => {
+	return request({
+		url : "months/buy",
+		data: data
+	})
+}
+
+// 月兑活动 - 提交订单
+const buySubmit = (data) => {
+	return request({
+		url     : "months/buy",
+		method  : "POST",
+		data    : data
+	})
+}
+
+// 月兑活动 - 优惠券列表
+const logs = (data) => {
+	return request({
+		url     : "account/logs",
+		data    : data
+	})
+}
+
+// 月兑活动 - 账变列表
+const coupon = (data) => {
+	return request({
+		url     : "months/coupons",
+		data    : data
+	})
+}
+
+// 月兑活动 - 兑换列表
+const monthsList = (category_id) => {
+	return request({
+		url     : "months/goods/" + category_id
+	})
+}
+
+
+// 月兑活动 - 兑换列表
+const monthsChoose = (category_id) => {
+	return request({
+		url     : "months/category/" + category_id + "/choose"
+	})
+}
+
+export {
+	index,
+	details,
+    buy,
+    buySubmit,
+	coupon,
+	logs,
+	monthsList,
+	monthsChoose
+}
\ No newline at end of file
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
new file mode 100644
index 0000000..3e20cd1
--- /dev/null
+++ b/apis/interfaces/index.js
@@ -0,0 +1,73 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 活动权益内容
+const activity = (data) => {
+    return request({
+        url: 'home',
+        data: data
+    })
+}
+
+// 钻石+白金权益内容
+const index = (data) => {
+    return request({
+        url: 'home/group',
+        data: data
+    })
+}
+
+// 周五福利日订阅
+const subscribe = (subscribe) => {
+    return request({
+        url: 'wechat/' + subscribe + "/welfare_subscribe",
+        method: "POST"
+    })
+}
+
+// 所有城市-最新无字母
+const newCity = () => {
+    return request({
+        url: 'ajax/all_right_citys'
+    })
+}
+
+// 市区选择-最新无字母
+const newidxCity = (data) => {
+    return request({
+        url: 'ajax/all_right_children',
+        data: data
+    })
+}
+
+// h5掉起微信授权的前置获取相关的签名信息前置
+const subscribeUrl = (data) => {
+    return request({
+        url: 'auth/jssdk',
+        data: data
+    })
+}
+
+const subscribeH5 = (subscribe, channel) => {
+    return request({
+        url: "wechat/" + subscribe + "/welfare_subscribe",
+        method: "POST",
+        data: {
+            channel: 'h5'
+        }
+    })
+}
+export {
+    activity,
+    index,
+    subscribe,
+    newCity,
+    newidxCity,
+    subscribeUrl,
+    subscribeH5
+}
\ No newline at end of file
diff --git a/apis/interfaces/oil.js b/apis/interfaces/oil.js
new file mode 100644
index 0000000..8034619
--- /dev/null
+++ b/apis/interfaces/oil.js
@@ -0,0 +1,33 @@
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+const index = (data) => {
+	return request({
+		url: 'petros'
+	})
+}
+
+// 校园活动确认订单
+const buy = (data) => {
+	return request({
+		url : "petros/buy",
+		data: data
+	})
+}
+
+// 校园活动提交订单
+const buySubmit = (data) => {
+	return request({
+		url     : "petros/buy",
+		method  : "POST",
+		data    : data
+	})
+}
+export {
+	index,
+    buy,
+    buySubmit
+}
\ No newline at end of file
diff --git a/apis/interfaces/recharge.js b/apis/interfaces/recharge.js
new file mode 100644
index 0000000..11003c6
--- /dev/null
+++ b/apis/interfaces/recharge.js
@@ -0,0 +1,30 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 充值前置
+const create = () => {
+    return request({
+        url : 'recharges/create'
+    })
+}
+
+// 充值提交
+const store = (recharge_id) => {
+    return request({
+        url : 'recharges/store',
+        method: 'POST',
+        data: {
+            recharge_id
+        }
+    })
+}
+
+export {
+    create,
+    store
+}
\ No newline at end of file
diff --git a/apis/interfaces/rights.js b/apis/interfaces/rights.js
new file mode 100644
index 0000000..5126b35
--- /dev/null
+++ b/apis/interfaces/rights.js
@@ -0,0 +1,143 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 权益详情
+const index = (data) => {
+    return request({
+        url : 'orders/create/',
+        data: data
+    })
+}
+
+// 权益分类
+const classify = (category_id, data) => {
+    return request({
+        url : 'categories/' + category_id,
+        data: data
+    })
+}
+
+// 权益购买提交
+const rightStore = (data) => {
+    return request({
+        url : 'orders/store/',
+        method: "POST",
+        data: data
+    })
+}
+
+// 洗车券-获取跳转地址 --暂时隐藏
+const washcarUrl = (data) => {
+    return request({
+        url: 'washcar/infourl',
+        data: data
+    })
+}
+
+// 获取洗车券信息
+const washcarBuy = (data) => {
+    return request({
+        url: 'washcar/create',
+        data: data
+    })
+}
+
+// 洗车券订单提交
+const washcarCreate = (data) => {
+    return request({
+        url : 'washcar/create',
+        method: "POST",
+        data: data
+    })
+}
+
+
+// h5微信支付获取微信授权地址
+const getAuthUrl = (url) => {
+    return request({
+        url : 'auth/get_auth_url',
+        data: {
+            url
+        }
+    })
+}
+
+// h5掉起微信支付的前置获取相关的签名信息
+const wpayH5Info = (data) => {
+    return request({
+        url : 'auth/jssdk',
+        data: data
+    })
+}
+
+//获取openid地址-web
+const unionpay = (data) => {
+    return request({
+        url : 'unionpay/openid',
+        data: data
+    })
+}
+
+//领取银联权益优惠券
+const unionCode = (data) => {
+    return request({
+        url : 'unionpay/union_openid',
+        data: data
+    })
+}
+
+// 权益 单订单支付
+const rightsSingle = (orderid) => {
+    return request({
+        url : 'payments/order',
+        data: {
+            orderid
+        }
+    })
+}
+
+// h5掉起微信支付的前置获取相关的签名信息
+// const fridayPayH5 = (url, data) => {
+//     return request({
+//         url : 'payments/welfare/wechat',
+//         method: "POST",
+//         data: data
+//     })
+// }
+
+// H5 权益支付
+// const wechatH5 = (data) => {
+//     return request({
+//         url : 'payments/wechat',
+//         method: "POST",
+//         data: data
+//     })
+// }
+
+const h5Pay = (url, data) => {
+    return request({
+        url: url,
+        method: "POST",
+        data
+    })
+}
+
+export {
+    index,
+    classify,
+    rightStore,
+    washcarUrl,
+    washcarBuy,
+    washcarCreate,
+    getAuthUrl,
+    wpayH5Info,
+    unionpay,
+    unionCode,
+    rightsSingle,
+    h5Pay
+}
\ No newline at end of file
diff --git a/apis/interfaces/subscribe.js b/apis/interfaces/subscribe.js
new file mode 100644
index 0000000..5398fde
--- /dev/null
+++ b/apis/interfaces/subscribe.js
@@ -0,0 +1,27 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+// 业务信息
+const business = (type) => {
+	return request({
+		url: "business/" + type
+	})
+}
+
+// 提交预约
+const create = (data) => {
+	return request({
+		url: "business/create",
+		method: "POST",
+        data: data
+	})
+}
+
+export {
+	business,
+    create
+}
diff --git a/apis/interfaces/unicom.js b/apis/interfaces/unicom.js
new file mode 100644
index 0000000..c86b9b3
--- /dev/null
+++ b/apis/interfaces/unicom.js
@@ -0,0 +1,33 @@
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+import request from '../request'
+
+const index = (data) => {
+	return request({
+		url: 'activity/unicoms'
+	})
+}
+
+// 校园活动确认订单
+const buy = (data) => {
+	return request({
+		url : "activity/unicoms/buy",
+		data: data
+	})
+}
+
+// 校园活动提交订单
+const buySubmit = (data) => {
+	return request({
+		url     : "activity/unicoms/buy",
+		method  : "POST",
+		data    : data
+	})
+}
+export {
+	index,
+    buy,
+    buySubmit
+}
\ No newline at end of file
diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js
new file mode 100644
index 0000000..7957c2b
--- /dev/null
+++ b/apis/interfaces/user.js
@@ -0,0 +1,419 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 活动权益内容
+const index = () => {
+    return request({
+        url: 'user'
+    })
+}
+
+// 卡券详情
+const couponinfo = (data) => {
+    return request({
+        url: 'coupons/show',
+        data: data
+    })
+}
+
+// 卡券二维码
+const qrcode = (coupon_id) => {
+    return request({
+        url: 'coupons/qrcode',
+        data: {
+            coupon_id
+        }
+    })
+}
+
+// 卡券条形码
+const barcode = (coupon_id) => {
+    return request({
+        url: 'coupons/' + coupon_id +  '/barcode'
+    })
+}
+
+// 卡券列表
+const coupon = (status) => {
+    return request({
+        url: 'coupons?status=' + status
+    })
+}
+
+// 卡券分组
+const couponArr = (data) => {
+    return request({
+        url: 'coupons/list',
+        data: data
+    })
+}
+
+// 积分账变记录
+const logs = (data) => {
+    return request({
+        url: 'account/logs',
+        data: data
+    })
+}
+
+// 订单收益列表
+const profits = (data) => {
+    return request({
+        url: 'data/profits',
+        data: data
+    })
+}
+
+// 订单收益列表-下级明细
+const profitsNext = (data) => {
+    return request({
+        url: 'data/profitlogs',
+        data: data
+    })
+}
+
+// 积分卡激活
+const cards = (data) => {
+    return request({
+        url: 'user/cards/activate',
+        method: "POST",
+        data: data
+    })
+}
+
+// 冻结列表
+const ungrants = (type) => {
+    return request({
+        url: 'account/newungrants',
+        data: {
+        	type
+        }
+    })
+}
+
+// 洗车券-获取跳转地址
+const washcarCoupon = (coupon) => {
+    return request({
+        url: 'washcar/' + coupon + "/info",
+        method: "POST"
+    })
+}
+
+//权益商品订单列表
+const orders = (data) => {
+    return request({
+        url: 'orders/index',
+        data: data
+    })
+}
+
+//权益订单列表
+const ordersCoupons = (data) => {
+    return request({
+        url: 'orders/coupons',
+        data: data
+    })
+}
+
+//取消兑换订单
+const cancel = (orderid) => {
+    return request({
+        url: 'orders/cancel?orderid=' + orderid,
+        method: "POST"
+    })
+}
+
+// 福利商品订单列表
+const welfare = (data) => {
+    return request({
+        url: 'welfares/orders',
+        data: data
+    })
+}
+
+// 福利券订单列表
+const welfareCoupons = (data) => {
+    return request({
+        url: 'welfares/coupons',
+        data: data
+    })
+}
+
+// 福利取消订单
+const welfaresCancel = (orderid) => {
+    return request({
+        url: 'welfares/orders/cancel?orderid=' + orderid,
+        method: "POST"
+    })
+}
+
+//权益订单详情
+const show = (orderid) => {
+    return request({
+        url: 'orders/show',
+        data: {
+            orderid
+        }
+    })
+}
+
+//周五福利订单详情
+const welfaresShow = (orderid) => {
+    return request({
+        url: 'welfares/orders/show',
+        data: {
+            orderid
+        }
+    })
+}
+
+// 头像上传+昵称修改
+const upload = (data) => {
+    return request({
+        url: 'user/setting/info',
+        method: "POST",
+        data: data
+    })
+}
+
+// 发送短信
+const send = (data) => {
+    return request({
+        url: 'sms/send',
+        method: "POST",
+        data: data
+    })
+}
+
+// 设置支付密码
+const setPassword = (data) => {
+    return request({
+        url: 'user/setting/set_password',
+        method: "POST",
+        data: data
+    })
+}
+
+// 修改支付密码
+const changePassword = (data) => {
+    return request({
+        url: 'user/setting/change_password',
+        method: "POST",
+        data: data
+    })
+}
+
+// 重置支付密码
+const resetPassword = (data) => {
+    return request({
+        url: 'user/setting/reset_password',
+        method: "POST",
+        data: data
+    })
+}
+
+//门店列表
+const stores = (data) => {
+    return request({
+        url: 'coupons/new_stores',
+        method: "POST",
+        data: data
+    })
+}
+
+//门店详情
+const storesShow = (data) => {
+    return request({
+        url: 'coupons/store/show',
+        data: data
+    })
+}
+
+//省市区
+const areas = (psn) => {
+    return request({
+        url: 'areas/children?psn=' + psn
+    })
+}
+
+// 2021-07-28新增
+// 我的收益
+const myProfit = () => {
+    return request({
+        url: 'data/index'
+    })
+}
+
+// 我的收益-收益报表
+const myIncome = (month) => {
+    return request({
+        url: 'data/income',
+        data:{
+            month
+        }
+    })
+}
+
+// 我的收益-收益报表  + 我的收益-我的团队
+const profitUrl = (url, data) => {
+    return request({
+        url: url,
+        data: data
+    })
+}
+
+// 提现前置账户信息
+const withdraws = () => {
+    return request({
+        url: 'withdraws/create'
+    })
+}
+
+// 提现记录列表
+const withdrawsList = (data) => {
+    return request({
+        url: 'user/withdraws',
+        data: data
+    })
+}
+
+// 提现表单填写
+const withdrawsForm = (data) => {
+    return request({
+        url: 'withdraws',
+        method: "POST",
+        data: data
+    })
+}
+
+// 权益详细列表
+const profitLogs = (data) => {
+    return request({
+        url: 'data/logs',
+        data: data
+    })
+}
+
+// 转账获取积分账户分类
+const transfers = () => {
+    return request({
+        url: 'user/transfers'
+    })
+}
+
+// 转账提交表单
+const transfersForm = (data) => {
+    return request({
+        url: 'user/transfers',
+        method: "POST",
+        data: data
+    })
+}
+
+// 校验转账的手机号码
+const ajaxTel = (mobile) => {
+    return request({
+        url: 'ajax/user',
+        data: {
+            mobile
+        }
+    })
+}
+
+// 产品分享 - 新增
+const productList = (page) => {
+    return request({
+        url: 'shares/goods',
+        data: {
+            page
+        }
+    })
+}
+
+const productInfo = (right) => {
+    return request({
+        url: 'shares/goods/' + right
+    })
+}
+
+const productPoster = (right) => {
+    return request({
+        url: 'shares/goods/' + right + '/poster'
+    })
+}
+
+// 我的分享
+const myshare = (data) => {
+    return request({
+        url: 'user/share',
+        data: data
+    })
+}
+
+// 产品分享二维码+储值分享二维码
+const publicCode = (data) => {
+    return request({
+        url: 'user/share/goods',
+        data: data
+    })
+}
+
+// 储值分享
+const storedList = () => {
+    return request({
+        url: 'shares/recharges'
+    })
+}
+
+
+export {
+    index,
+    couponinfo,
+    qrcode,
+    barcode,
+    coupon,
+    couponArr,
+    logs,
+    profits,
+    profitsNext,
+    cards,
+    ungrants,
+    washcarCoupon,
+    orders,
+    ordersCoupons,
+    cancel,
+    welfare,
+    welfareCoupons,
+    welfaresCancel,
+    show,
+    welfaresShow,
+    upload,
+    send,
+    setPassword,
+    changePassword,
+    resetPassword,
+    stores,
+    storesShow,
+    areas,
+    myProfit,
+    myIncome,
+    profitUrl,
+    withdraws,
+    withdrawsList,
+    withdrawsForm,
+    profitLogs,
+    transfers,
+    transfersForm,
+    ajaxTel,
+    productList,
+    productInfo,
+    productPoster,
+    myshare,
+    publicCode,
+    storedList
+}
\ No newline at end of file
diff --git a/apis/interfaces/welfares.js b/apis/interfaces/welfares.js
new file mode 100644
index 0000000..4690efb
--- /dev/null
+++ b/apis/interfaces/welfares.js
@@ -0,0 +1,40 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request.js'
+
+// 周五福利日详情
+const index = (welfare_id, data) => {
+    return request({
+        url : 'welfare/' + welfare_id,
+        data: data
+    })
+}
+
+
+//周五福利-获取支付信息
+const fridayInfo = (welfare_id, data) => {
+    return request({
+        url : 'welfare/order/' + welfare_id,
+        data: data
+    })
+}
+
+// 周五福利 单订单支付
+const welfSingle = (orderid) => {
+    return request({
+        url : 'payments/welfare',
+        data: {
+            orderid
+        }
+    })
+}
+
+export {
+    index,
+    fridayInfo,
+    welfSingle
+}
\ No newline at end of file
diff --git a/apis/interfaces/wxJSDK.js b/apis/interfaces/wxJSDK.js
new file mode 100644
index 0000000..9064224
--- /dev/null
+++ b/apis/interfaces/wxJSDK.js
@@ -0,0 +1,17 @@
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import request from '../request'
+
+const config = (data) => {
+    return request({
+        url : 'auth/jssdk',
+        data: data
+    })
+}
+
+export {
+	config
+}
diff --git a/apis/request.js b/apis/request.js
new file mode 100644
index 0000000..67e8111
--- /dev/null
+++ b/apis/request.js
@@ -0,0 +1,140 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import store from '@/store'
+
+// 基础配置
+// https://lifetest.ysd-bs.com //测试地址
+// https://card.ysd-bs.com
+const config = {
+    // apiUrl : 'https://lifetest.ysd-bs.com/api/',
+	apiUrl : 'https://card.ysd-bs.com/api/',
+    timeout: 60000
+}
+
+let loginHintState = false
+
+// 网络请求
+const request = (parameter) => {
+    // 检查url配置
+    if(parameter.url === 'undefined' || parameter.url === '') {
+        uni.showToast({
+            title: '请求地址不能为空',
+            icon : 'none'
+        })
+        return
+    }
+    
+    // 注入header
+    config.header = {
+        'Accept': 'application/json',
+        'Authorization': store.getters.getToken || ''
+    }
+    // 请求实例
+    return new Promise((resolve, reject) => {
+        uni.request({
+            url     : config.apiUrl + parameter.url,
+            timeout : config.timeout,
+            header  : config.header    || {},
+            data    : parameter.data   || {},
+            method  : parameter.method || 'GET',
+            success: res => {
+                if (res.header.Authorization) {
+                    updateToken('token', res.header.Authorization)
+                }
+                if (res.statusCode === 200) {
+                    const resolveData = res.data
+                    if(resolveData.status_code === 200) {
+                        resolve(resolveData.data)
+                        return
+                    }
+                    if (resolveData.status_code === 401) {
+                        loginHint()
+                        return
+                    }
+                    reject(resolveData)
+                    return
+                }
+                errToast(res.statusCode)
+            }
+        })
+    })
+}
+
+// 处理一些http请求错误提示
+const errToast = (code) => {
+    switch (code){
+        case 404:
+            uni,uni.showToast({
+                title: code + '接口不存在，请联系系统管理员',
+                icon : none
+            })
+            break;
+        case 405:
+            uni.showToast({
+                title: code + '请检查接口请求方式错误',
+                icon :'none'
+            })
+            break;
+        case 500:
+            uni.showToast({
+                title: code + '服务端错误，请检查服务器信息',
+                icon : 'none'
+            })
+            break;
+    }
+}
+
+// 更新token
+const updateToken = (token) => {
+    store.commit('setToken', token)
+}
+
+// 处理登录提示
+const loginHint = () => {
+    if(loginHintState) return
+    if(!loginHintState) loginHintState = true
+    updateToken('')
+    uni.showModal({
+        title:'登录提示',
+        content:'您的登录信息已过期，请重新登录',
+        confirmColor:'#33f800',
+        showCancel:false,
+        success: res => {
+			console.log(getApp().globalData.envType)
+            loginHintState = false
+            if(res.confirm){
+                if(getApp().globalData.envType == 'campusEnv') {
+                    uni.reLaunch({
+                        url: '/pages/campus/signin'
+                    })
+                } else if(getApp().globalData.envType == 'oilEnv') {
+                    uni.reLaunch({
+                        url: '/pages/oil/signin'
+                    })
+                }else if(getApp().globalData.envType == 'unicomEnv') {
+                    uni.reLaunch({
+                        url: '/pages/unicom/signin'
+                    })
+                }else if(getApp().globalData.envType == 'drawEnv') {
+                    uni.reLaunch({
+                        url: '/pages/draw/signin'
+                    })
+                }else if(getApp().globalData.envType == 'giftPEnv') {
+                    uni.reLaunch({
+                        url: '/pages/giftPack/signin'
+                    })
+                }else {
+                    uni.reLaunch({
+                        url: '/pages/auth/login'
+                    })
+                }
+            }
+        }
+    })
+}
+
+export default request
\ No newline at end of file
diff --git a/js_sdk/ican-clipBoard/ican-clipBoard.js b/js_sdk/ican-clipBoard/ican-clipBoard.js
new file mode 100644
index 0000000..f16c8f6
--- /dev/null
+++ b/js_sdk/ican-clipBoard/ican-clipBoard.js
@@ -0,0 +1,41 @@
+/** clipboard.js v2.0.4**/
+!function(t,e){try{global.ClipboardJS=e();}catch(e){};"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(n){var o={};function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}
+  return r.m=n,r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=0)}([function(t,e,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}
+  return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=o(n(1)),c=o(n(3)),u=o(n(4));function o(t){return t&&t.__esModule?t:{default:t}}
+  var l=function(t){function o(t,e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o);var n=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(o.__proto__||Object.getPrototypeOf(o)).call(this));return n.resolveOptions(e),n.listenClick(t),n}
+    return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(o,c.default),i(o,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===r(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=(0,u.default)(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new a.default({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return s("action",t)||'copy'}},{key:"defaultTarget",value:function(t){var e=s("target",t);if(e){return document.querySelector(e)}}},{key:"defaultText",value:function(t){return s("text",t)||this.text}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported;return e.forEach(function(t){n=n&&!!document.queryCommandSupported(t)}),n}}]),o}();function s(t,e){var n="data-clipboard-"+t;let isFun=e&&typeof e.hasAttribute==='function';if(isFun&&e.hasAttribute(n)){return e.getAttribute(n)}}
+  t.exports=l},function(t,e,n){"use strict";var o,r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}
+  return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=n(2),c=(o=a)&&o.__esModule?o:{default:o};var u=function(){function e(t){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e),this.resolveOptions(t),this.initSelection()}
+  return i(e,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=(0,c.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=(0,c.default)(this.target),this.copyText()}},{key:"copyText",value:function(){var e=void 0;try{e=document.execCommand(this.action)}catch(t){e=!1}
+      this.handleResult(e)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),e}();t.exports=u},function(t,e){t.exports=function(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}
+  return e}},function(t,e){function n(){}
+  n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}
+      return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,a=o.length;i<a;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=n},function(t,e,n){var d=n(5),h=n(6);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!d.string(e))throw new TypeError("Second argument must be a String");if(!d.fn(n))throw new TypeError("Third argument must be a Function");if(d.node(t))return s=e,f=n,(l=t).addEventListener(s,f),{destroy:function(){l.removeEventListener(s,f)}};if(d.nodeList(t))return a=t,c=e,u=n,Array.prototype.forEach.call(a,function(t){t.addEventListener(c,u)}),{destroy:function(){Array.prototype.forEach.call(a,function(t){t.removeEventListener(c,u)})}};if(d.string(t))return o=t,r=e,i=n,h(document.body,o,r,i);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,a,c,u,l,s,f}},function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e,n){var a=n(7);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=a(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}
+  t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},function(t,e){if("undefined"!=typeof Element&&!Element.prototype.matches){var n=Element.prototype;n.matches=n.matchesSelector||n.mozMatchesSelector||n.msMatchesSelector||n.oMatchesSelector||n.webkitMatchesSelector}
+  t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}}])});let Types={isFunction:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object Function]'},isObject:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object Object]'},isString:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object String]'}}
+//#ifdef H5
+uni.setClipboardData=function(options){let emptyFun=function(){}
+  let config={data:null,event:null,success:emptyFun,fail:emptyFun,complete:emptyFun}
+  if(options&&Types.isObject(options)){config=Object.assign({},config,options)}
+  if(options&&Types.isString(options)){config=Object.assign({},config,{data:options})}
+  let data=config.data
+  let success=config.success||emptyFun
+  let fail=config.fail||emptyFun
+  let complete=config.complete||emptyFun
+  let e=config.event||window.event||{}
+  let cb=new ClipboardJS('.null',{text:()=>data})
+  cb.on('success',function(res){success&&Types.isFunction(success)&&success(res)
+    complete&&Types.isFunction(complete)&&complete()
+    cb.off('error')
+    cb.off('success')
+    cb.destroy()})
+  cb.on('error',function(err){fail&&Types.isFunction(fail)&&fail(err)
+    complete&&Types.isFunction(complete)&&complete()
+    cb.off('error')
+    cb.off('success')
+    cb.destroy()})
+  cb.onClick(e)}
+//#endif
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..4121ca7
--- /dev/null
+++ b/main.js
@@ -0,0 +1,22 @@
+import Vue from 'vue'
+import App from './App'
+import store from './store'
+import { VueJsonp } from 'vue-jsonp'
+
+Vue.config.productionTip = false
+
+// Vue.config.ignoredElements = ['wx-open-subscribe']
+
+Vue.prototype.$store = store
+Vue.prototype.$wx = require('jweixin-module')
+App.mpType = 'app'
+
+
+
+// jsonp
+Vue.use(VueJsonp)
+
+const app = new Vue({
+    ...App
+})
+app.$mount()
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..4ea6d2e
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,106 @@
+{
+    "name" : "本时生活H5",
+    "appid" : "__UNI__8D6D53E",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Payment" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wx0e1082e90b9aa6a5",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    "permission" : {
+        "scope.userLocation" : {
+            "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+        }
+    },
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx8e424dbdc443381f",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "h5" : {
+        "router" : {
+            "mode" : "history"
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "4KYBZ-LCAKF-QWOJN-NIDNZ-FZHLZ-2XFW7"
+                }
+            }
+        },
+        "title" : "本时生活"
+    }
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..bfec92c
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,16 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
+    "vue-jsonp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
+      "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
+    }
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..3824933
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,743 @@
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/auth/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"animationType": "slide-in-bottom"
+				}
+			}
+		},{
+			"path": "pages/auth/register",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"animationType": "slide-in-bottom"
+				}
+			}
+		},{
+        	"path": "pages/auth/password",
+        	"style": {
+        		"navigationBarTitleText": "",
+        		"enablePullDownRefresh": false,
+        		"navigationBarBackgroundColor": "#FFFFFF",
+        		"navigationStyle": "custom",
+        		"app-plus": {
+        			"animationType": "slide-in-bottom"
+        		}
+        	}
+        },{
+        	"path": "pages/auth/psssword_forget",
+        	"style": {
+        		"navigationBarTitleText": "",
+        		"enablePullDownRefresh": false,
+        		"navigationBarBackgroundColor": "#FFFFFF",
+        		"navigationStyle": "custom",
+        		"app-plus": {
+        			"animationType": "slide-in-bottom"
+        		}
+        	}
+        },{
+        	"path": "pages/auth/password_login",
+        	"style": {
+        		"navigationBarTitleText": "",
+        		"enablePullDownRefresh": false,
+        		"navigationBarBackgroundColor": "#FFFFFF",
+        		"navigationStyle": "custom",
+        		"app-plus": {
+        			"animationType": "slide-in-bottom"
+        		}
+        	}
+        },{
+			"path": "pages/index/index",
+			"style": {
+                "navigationBarTitleText":"首页",
+                "navigationStyle": "custom",
+                "navigationBarTextStyle": "white",
+                "navigationStyle": "custom"
+			}
+		},{
+        	"path": "pages/user/index",
+        	"style": {
+                "navigationBarTitleText": "个人中心",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#FFFFFF",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/rights/index",
+        	"style": {
+                "navigationBarTitleText": "卡券权益",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#000000",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/webView/webView",
+        	"style": {
+                "navigationBarTitleText": "",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/subscribe/upgrade/upgrade",
+        	"style": {
+                "navigationBarTitleText": "5G升级包预约",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor":"#2a211e",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/subscribe/combo/combo",
+        	"style": {
+                "navigationBarTitleText": "冰激凌预约",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor":"#2a211e",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/switchcity/switchcity",
+        	"style": {
+                "navigationBarTitleText": "切换城市",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/welfare/welfare",
+        	"style": {
+                "navigationBarTitleText": "支付详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/classify/classify",
+        	"style": {
+                "navigationBarTitleText": "卡券权益",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#000000",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/account",
+        	"style": {
+                "navigationBarTitleText": "账变记录",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/myBalance",
+        	"style": {
+                "navigationBarTitleText": "收益账户",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/myBalance_list",
+        	"style": {
+                "navigationBarTitleText": "收益列表",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/myProfit",
+        	"style": {
+                "navigationBarTitleText": "我的收益",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/myProfit_list",
+        	"style": {
+                "navigationBarTitleText": "权益列表",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/withdrawal_record",
+        	"style": {
+                "navigationBarTitleText": "提现记录",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/withdrawal_form",
+        	"style": {
+                "navigationBarTitleText": "提现申请",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/account/recharge",
+        	"style": {
+                "navigationBarTitleText": "充值中心",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#dfb48b",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/frozen/frozen",
+        	"style": {
+                "navigationBarTitleText": "待发放",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#24315d",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/favour/favour",
+        	"style": {
+                "navigationBarTitleText": "积分赠与",
+                "navigationStyle": "custom",
+                "navigationBarBackgroundColor": "#24315d",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/coupon/coupon",
+        	"style": {
+                "navigationBarTitleText": "我的卡券",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/couponDetails/couponDetails",
+        	"style": {
+                "navigationBarTitleText": "卡券详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/couponArr/couponArr",
+        	"style": {
+                "navigationBarTitleText": "我的卡券",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/packet/packet",
+        	"style": {
+                "navigationBarTitleText": "联通红包",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/activate/activate",
+        	"style": {
+                "navigationBarTitleText": "卡激活",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/site/index",
+        	"style": {
+                "navigationBarTitleText": "我的地址",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/site/create",
+        	"style": {
+                "navigationBarTitleText": "新增地址",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/site/edit",
+        	"style": {
+                "navigationBarTitleText": "编辑地址",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/washcar/washcar",
+        	"style": {
+                "navigationBarTitleText": "",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/car/index",
+        	"style": {
+                "navigationBarTitleText": "亿时代",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/order/order",
+        	"style": {
+                "navigationBarTitleText": "我的订单",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/order/orderData",
+        	"style": {
+                "navigationBarTitleText": "订单详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/setUpForm/index",
+        	"style": {
+                "navigationBarTitleText": "个人设置",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/setUpForm/form_submit",
+        	"style": {
+                "navigationBarTitleText": "个人设置",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/payPassword/index",
+        	"style": {
+                "navigationBarTitleText": "支付密码",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/payPassword/setup",
+        	"style": {
+                "navigationBarTitleText": "支付密码设置",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/payPassword/forget",
+        	"style": {
+                "navigationBarTitleText": "找回密码",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/cashier/index",
+        	"style": {
+                "navigationBarTitleText": "收银台",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/index",
+        	"style": {
+                "navigationBarTitleText": "校园迎新活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/buy",
+        	"style": {
+                "navigationBarTitleText": "活动购买",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/myCoupon",
+        	"style": {
+                "navigationBarTitleText": "我的优惠券",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/details",
+        	"style": {
+                "navigationBarTitleText": "活动详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/signin",
+        	"style": {
+                "navigationBarTitleText": "校园迎新活动 登录",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/campus/myList",
+        	"style": {
+                "navigationBarTitleText": "优惠券列表",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/store/index",
+        	"style": {
+                "navigationBarTitleText": "门店列表",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/store/details",
+        	"style": {
+                "navigationBarTitleText": "门店详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+            "path" : "pages/campus/register",
+            "style" : {
+                "navigationBarTitleText": "快速注册",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/campus/password",
+            "style" : {
+                "navigationBarTitleText": "忘记密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/campus/setPassword",
+            "style" : {
+                "navigationBarTitleText": "重置密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/userGoods/index",
+            "style" : {
+                "navigationBarTitleText": "产品分享",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/userGoods/goodsDet",
+            "style" : {
+                "navigationBarTitleText": "产品详情",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/userGoods/goodsCode",
+            "style" : {
+                "navigationBarTitleText": "产品分享-分享码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/code/code",
+            "style" : {
+                "navigationBarTitleText": "我的邀请码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/userStored/index",
+            "style" : {
+                "navigationBarTitleText": "储值分享",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/userStored/storedCode",
+            "style" : {
+                "navigationBarTitleText": "储值分享-分享码",
+                "enablePullDownRefresh": false
+            }
+        },{
+        	"path": "pages/oil/index",
+        	"style": {
+                "navigationBarTitleText": "联通优惠活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/oil/buy",
+        	"style": {
+                "navigationBarTitleText": "活动购买",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/oil/myCoupon",
+        	"style": {
+                "navigationBarTitleText": "我的优惠券",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/oil/details",
+        	"style": {
+                "navigationBarTitleText": "活动详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/oil/signin",
+        	"style": {
+                "navigationBarTitleText": "联通优惠活动 登录",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/oil/myList",
+        	"style": {
+                "navigationBarTitleText": "优惠券列表",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+            "path" : "pages/oil/register",
+            "style" : {
+                "navigationBarTitleText": "快速注册",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/oil/password",
+            "style" : {
+                "navigationBarTitleText": "忘记密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/oil/setPassword",
+            "style" : {
+                "navigationBarTitleText": "重置密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+        	"path": "pages/giftPack/index",
+        	"style": {
+                "navigationBarTitleText": "本时礼包活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/list",
+        	"style": {
+                "navigationBarTitleText": "本时礼包活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/user",
+        	"style": {
+                "navigationBarTitleText": "我的",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/buy",
+        	"style": {
+                "navigationBarTitleText": "活动购买",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/myCoupon",
+        	"style": {
+                "navigationBarTitleText": "我的优惠券",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/details",
+        	"style": {
+                "navigationBarTitleText": "优惠券详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/giftPack/signin",
+        	"style": {
+                "navigationBarTitleText": "本时礼包活动 登录",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+            "path" : "pages/giftPack/register",
+            "style" : {
+                "navigationBarTitleText": "快速注册",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/giftPack/password",
+            "style" : {
+                "navigationBarTitleText": "忘记密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/giftPack/setPassword",
+            "style" : {
+                "navigationBarTitleText": "重置密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/giftPack/logs",
+            "style" : {
+                "navigationBarTitleText": "积分记录",
+                "enablePullDownRefresh": false
+            }
+        },{
+        	"path": "pages/unicom/index",
+        	"style": {
+                "navigationBarTitleText": "中国联通回馈活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/unicom/buy",
+        	"style": {
+                "navigationBarTitleText": "活动购买",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/unicom/details",
+        	"style": {
+                "navigationBarTitleText": "活动详情",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/unicom/signin",
+        	"style": {
+                "navigationBarTitleText": "中国联通回馈活动 登录",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+            "path" : "pages/unicom/register",
+            "style" : {
+                "navigationBarTitleText": "快速注册",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/unicom/password",
+            "style" : {
+                "navigationBarTitleText": "忘记密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/unicom/setPassword",
+            "style" : {
+                "navigationBarTitleText": "重置密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+        	"path": "pages/draw/index",
+        	"style": {
+                "navigationBarTitleText": "抽奖活动",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+        	"path": "pages/draw/signin",
+        	"style": {
+                "navigationBarTitleText": "抽奖活动 登录",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+        	}
+        },{
+            "path" : "pages/draw/register",
+            "style" : {
+                "navigationBarTitleText": "抽奖活动 快速注册",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/password",
+            "style" : {
+                "navigationBarTitleText": "抽奖活动 忘记密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/setPassword",
+            "style" : {
+                "navigationBarTitleText": "抽奖活动 重置密码",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/myCoupon",
+            "style" : {
+                "navigationBarTitleText": "我的优惠券",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/couponDetails",
+            "style" : {
+                "navigationBarTitleText": "优惠券详情",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/order",
+            "style" : {
+                "navigationBarTitleText": "我的订单",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/orderDetails",
+            "style" : {
+                "navigationBarTitleText": "订单详情",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/logs",
+            "style" : {
+                "navigationBarTitleText": "抽奖记录",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/choose",
+            "style" : {
+                "navigationBarTitleText": "选择产品",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/right",
+            "style" : {
+                "navigationBarTitleText": "购买权益",
+                "enablePullDownRefresh": false
+            }
+        },{
+            "path" : "pages/draw/success",
+            "style" : {
+                "navigationBarTitleText": "兑换成功",
+                "enablePullDownRefresh": false
+            }
+        }
+    ],
+    "tabBar": {
+    	"color": "#9b9f9f",
+    	"selectedColor": "#000000",
+    	"backgroundColor": "#FFFFFF",
+    	"borderStyle": "#ddd",
+    	"list": [{
+    		"pagePath": "pages/index/index",
+    		"text": "首页",
+    		"iconPath": "static/tabBarIcon/00.png",
+    		"selectedIconPath": "static/tabBarIcon/00_active.png"
+    	}, {
+    		"pagePath": "pages/user/index",
+    		"text": "我的",
+    		"iconPath": "static/tabBarIcon/01.png",
+    		"selectedIconPath": "static/tabBarIcon/01_active.png"
+    	}]
+    },
+	
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "default"
+	}
+}
diff --git a/pages/account/account.vue b/pages/account/account.vue
new file mode 100644
index 0000000..8804729
--- /dev/null
+++ b/pages/account/account.vue
@@ -0,0 +1,300 @@
+<template>
+    <view>
+        <!-- 账户余额 -->
+        <view class="integra-top">
+        	<view class="integra-name">
+        		<block v-if="balanceType == 'silver'">白金账户余额</block>
+        		<block v-else-if="balanceType == 'drill'">钻石账户余额</block>
+        	</view>
+        	<view class="integra-info">
+        		<view class="integra-right">
+        			<view class="integra-title"><text>可用余额</text><image src="/static/icon/integra_icon00.png"></image></view>
+        			<view class="integra-number">{{ balanceData.number }}</view>
+                    <view class="integra-btn"><text>可用余额，入账记录</text></view>
+                    <!-- <navigator class="integra-btn" hover-class="none" url="/pages/account/recharge"><text>立即充值</text><image src="/static/icon/rightsArrow.png"></image></navigator> -->
+        		</view>
+        		<view class="integra-right">
+        			<view class="integra-title"><text>待发放</text><image src="/static/icon/integra_icon01.png"></image></view>
+        			<view class="integra-number">{{ balanceData.blockeds }}</view>
+        			<navigator hover-class="none" :url="'/pages/frozen/frozen?type=' + balanceType + '&blockeds=' + balanceData.blockeds" class="integra-btn integra-blue">立即查询<image src="/static/icon/rightsArrow.png"></image></navigator>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 账变记录 -->
+        <view class="integra-cont">
+        	<view class="integra-cont-title">
+        		<view class="integra-cont-name">账变记录</view>
+        		<view class="integra-cont-picker" v-if="balanceData.screenArray[balanceData.screenIndex]">
+        			<picker @change="screenBind" :value="balanceData.screenIndex" :range-key="'name'" :range="balanceData.screenArray">
+        				{{ balanceData.screenArray[balanceData.screenIndex].name }}
+        			</picker>
+        			<image class="integra-cont-icon" src="/static/icon/arrow_down.png"></image>
+        		</view>
+        	</view>
+            <block v-if="balanceData.accounts.length > 0">
+                <view class="integra-list" v-for="(item,index) in balanceData.accounts" :key="index">
+                    <view class="integra-text">
+                        <view class="integra-title">
+                            <view class="integra-title-tips" :class="{active : item.channel == 'in'}">{{ item.channel == 'in' ? '入' : '出' }}</view>{{ item.title }}
+                        </view>
+                        <view class="integra-oints" :class="{active : item.channel == 'in'}">
+                            {{ item.variable }}
+                        </view>
+                    </view>
+                    <view class="integra-remark">
+                        {{ item.remark }}
+                    </view>
+                    <view class="integra-date">
+                        <view class="integra-time">
+                            <text>{{ item.channel == 'in' ? '有效期：' : '扣除时间：' }}</text>
+                            {{ item.created_at }}{{ item.channel == 'in' ? ' 至 ' + item.expired_at : '' }}
+                        </view>
+                    </view>
+                </view>
+            </block>
+            
+            <!-- 暂无内容 -->
+            <view class="pack-center pages-hint" v-else>
+            	<image src="/static/img/null_icon.png"></image>
+            	<view>抱歉，目前暂无内容~</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { logs } from '@/apis/interfaces/user'
+    import { create, store } from '@/apis/interfaces/recharge'
+    export default {
+    	data() {
+    		return {
+                balanceType : '',    // 卡来源-类型
+                balanceData : {
+                    blockeds        : '',    // 待发放余额
+                    number          : '',    // 账户余额
+                    accounts        : [],    //账户列表
+                    screenChannel   : '',    //账变记录筛选数组标识
+                    screenIndex     : 0,    //账变记录筛选index
+                    screenArray : [
+                        {
+                            channel: 'all',
+                            name: '全部'
+                        },
+                        {
+                            channel: 'in',
+                            name: '入账'
+                        },
+                        {
+                            channel: 'out',
+                            name: '出账'
+                        }
+                    ]
+                },
+                load:       {
+                    page    : 1,       // 第一页
+                    allpage : 0,       // 总页数
+                    has_more: false,   // 是否有分页
+                    show    : false    // 是否有下一页数据
+                },
+                finished    : false,  //商品列表没有更多商品是否显示
+                LoadData    : false   //数据加载完渲染
+            }
+        },
+        onLoad(options) {
+            this.balanceType = options.type
+        },
+        onShow() {
+            // 获取账变记录
+            this.accountInfo();
+        },
+        methods:{
+            // 账变记录
+            accountInfo() {
+                if (this.load.page == 1) {
+                    this.balanceData.accounts = [];
+                }
+                logs({
+                    type    : this.balanceType,
+                    channel : this.balanceData.screenChannel,
+                    page    : this.load.page
+                }).then(res=>{
+                    //判断金卡、银卡、钻石卡
+                    let number
+                    if(this.balanceType == "silver") {
+                        number = res.account.silver
+                    } else if(this.balanceType == "gold") {
+                        number = res.account.gold
+                    } else if(this.balanceType == "drill") {
+                        number = res.account.drill
+                    } else {
+                        return
+                    }
+                    this.balanceData.accounts = this.balanceData.accounts.concat(res.data)
+                    this.balanceData.number   = number
+                    this.balanceData.blockeds = res.blockeds
+                    this.load.allpage         = res.page.total_page
+                    this.load.has_more        = res.page.has_more
+                    
+                    // 数据渲染加载
+                    this.LoadData = true
+                })
+            },
+            
+            // 筛选账变记录-条件
+            screenBind(e) {
+                this.balanceData.screenIndex  = e.detail.value,
+                this.balanceData.screenChannel= this.balanceData.screenArray[e.detail.value].channel
+                
+                // 获取账变记录
+                this.accountInfo();
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 账户余额
+    .integra-top {
+        padding: 30rpx 20rpx 0;
+        background-color: #dfb48b;
+        border-radius: 0 0 100rpx 100rpx;
+        .integra-name {
+            color: #fff;
+            font-size: 32rpx;
+            margin-bottom: 30rpx;
+        }
+        .integra-info {
+            background-color: #fff;
+            text-align: center;
+            border-radius: 20rpx;
+            display: flex;
+            box-shadow: 0 10rpx 10rpx rgba(0, 0, 0, .1);
+            padding: 30rpx 20rpx;
+            box-sizing: border-box;
+            text-align: left;
+            .integra-right {
+                flex: 2;
+                position: relative;
+                &:first-child {
+                    padding-right: 20rpx;
+                    box-sizing: border-box;
+                }
+                &:last-child {
+                    padding-left: 30rpx;
+                    box-sizing: border-box;
+                }
+                &:first-child::after {
+                    display: none;
+                }
+                .integra-title {
+                    margin-bottom: 20rpx;
+                    display: flex;
+                    image {
+                        width: 36rpx;
+                        height: 36rpx;
+                        margin: 4rpx 0 0 10rpx;
+                    }
+                }
+                .integra-number {
+                    font-size: 40rpx;
+                }
+                .integra-btn {
+                    font-size: 28rpx;
+                    margin-top: 20rpx;
+                    color: #adadad;
+                    display: flex;
+                    text {
+                        color: #dfb48b;
+                    }
+                    image {
+                        width: 36rpx;
+                        height: 36rpx;
+                        margin-top: 2rpx;
+                    }
+                }
+                .integra-blue {
+                    color: #317afa;
+                }
+            }
+        }
+    }
+    
+    // 账变记录
+    .integra-cont-title {
+        padding: 40rpx 20rpx 10rpx;
+        display: flex;
+        .integra-cont-name {
+            font-weight: 600;
+            flex: 1;
+        }
+        .integra-cont-picker {
+            display: flex;
+            color: #797979;
+            font-size: 30rpx;
+            .integra-cont-icon {
+                width: 28rpx;
+                height: 28rpx;
+                margin: 6rpx 0 0 10rpx;
+            }
+        }
+    }
+    .integra-list {
+        width: calc(100% - 40rpx);
+        margin: 20rpx;
+        padding: 30rpx 20rpx;
+        position: relative;
+        box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, .1);
+        box-sizing: border-box;
+        background: #fff;
+        border-radius: 10rpx;
+        .integra-text {
+            display: flex;
+            margin-bottom: 20rpx;
+            .integra-title {
+                flex: 1;
+                font-size: 30rpx;
+                display: flex;
+                margin: 0;
+                .integra-title-tips {
+                    background-color: green;
+                    color: #fff;
+                    width: 40rpx;
+                    height: 40rpx;
+                    line-height: 38rpx;
+                    text-align: center;
+                    border-radius: 50%;
+                    margin-right: 10rpx;
+                    font-size: 24rpx;
+                    transform: scale(0.8);
+                    &.active {
+                        background-color: red;
+                    }
+                }
+            }
+            .integra-oints {
+                color: green;
+                &.active {
+                    color: red;
+                }
+            }
+        }
+        .integra-remark {
+            margin-bottom: 20rpx;
+            font-size: 26rpx;
+            color: #4e4e4e;
+            background: #f5f5f5;
+            display: inline-block;
+            padding: 6rpx 20rpx;
+            border-radius: 50rpx;
+        }
+        .integra-date {
+            display: flex;
+        }
+    }
+    
+    .pages-hint {
+        margin: 20rpx;
+        border-radius: 10rpx;
+    }
+</style>
diff --git a/pages/account/myBalance.vue b/pages/account/myBalance.vue
new file mode 100644
index 0000000..0d2b7ee
--- /dev/null
+++ b/pages/account/myBalance.vue
@@ -0,0 +1,298 @@
+<template>
+    <view>
+        <view class="balance">
+            <image class="balanceBack" src="https://card.ysd-bs.com/storage/materials/2021/09/01/balance-back.png" mode="widthFix"></image>
+            <view class="balanceCont">
+                <view class="balanceCont-name">余额（积分）</view>
+                <view class="balanceCont-number">
+                    <text>￥</text>{{ number }}
+                </view>
+            </view>
+            <navigator hover-class="none" url="/pages/account/myProfit" class="balanceUrl">我的收益<image src="/static/img/balance-icon-row.png" mode="aspectFill"></image></navigator>
+        </view>
+        
+        <navigator hover-class="none" url="/pages/account/withdrawal_form" class="label">
+            <view class="labelLeft">
+                <image class="labelLeft-img" src="/static/img/balance-icon-00.png"></image>
+                <view class="labelLeft-name">提现</view>
+            </view>
+            <image class="labelLeft-arrow" src="/static/icon/rightsArrow.png"></image>
+        </navigator>
+        
+        <navigator hover-class="none" :url="'/pages/account/withdrawal_record?status=' + '' + '&idx=0'" class="label">
+            <view class="labelLeft">
+                <image class="labelLeft-img" src="/static/img/balance-icon-01.png"></image>
+                <view class="labelLeft-name">提现记录</view>
+            </view>
+            <image class="labelLeft-arrow" src="/static/icon/rightsArrow.png"></image>
+        </navigator>
+        
+        <!-- 收益订单列表 -->
+        <view class="record">
+            <view class="integra-cont-title">
+                <view class="record-title">收益订单列表</view>
+            </view>
+            <block v-if="accounts.length > 0">
+                <navigator hover-class="none" :url="'/pages/account/myBalance_list?id=' + item.order_id + '&type=' + item.order_type" class="record-list" v-for="(item, index) in accounts" :key="index">
+                    <view class="accounts-title">{{ item.right }}</view>
+                    <view class="accounts-user">
+                        <image class="accounts-user-icon" src="/static/img/accountsIcon_00.png"></image>
+                        <view class="accounts-user-name"><text>{{ item.user.nickname }}</text>{{ item.user.username }}</view>
+                    </view>
+                    <view class="accounts-user">
+                        <image class="accounts-user-icon" src="/static/img/accountsIcon_01.png"></image>
+                        <view class="accounts-user-name">{{ item.created_at }}</view>
+                    </view>
+                    <view class="accounts-more"><image src="/static/icon/arrow_tips.png"></image></view>
+                </navigator>
+                <view class="pagesLoding" v-if="lodingStats">
+                    <block v-if="page.has_more">
+                        <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>加载中...
+                    </block>
+                    <block v-else>
+                        没有更多了~
+                    </block>
+                </view>
+            </block>
+            <!-- 暂无内容 -->
+            <view class="recommend-hint" v-else>
+                <image src="/static/img/null_icon.png"></image>
+                <view>抱歉，目前暂无内容~</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { logs, profits } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                number      : '',           // 账户余额
+                accounts    : '',           // 账户列表
+                page: {
+                    has_more: false
+                },                          // 下一页
+                lodingStats: false          // 数据加载完渲染
+    		}
+    	},
+        onLoad() {
+            // 获取余额数量
+            logs({
+                type    : 'balance',
+                channel : '',
+                page    : ''
+            }).then(res=>{
+                this.number = res.account.balance
+            })
+        },
+        onShow() {
+            // 获取账变记录
+            this.accountInfo();
+        },
+        methods: {
+            // 获取余额数量
+            accountInfo(page) {
+                profits({
+                    page    : page
+                }).then(res=>{
+                    let newStores = this.accounts,
+                        newData = []
+                    if(page == 1 || page == undefined) newStores = []
+                    newData = newStores.concat(res.data)
+                    this.accounts    = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                })
+            },
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.page = pageNumber
+                    this.storesInfo('', pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    
+    /* 背景 */
+    .balance {
+        position: relative;
+    }
+    
+    .balanceBack {
+        width: 100vw;
+        display: block;
+    }
+    
+    .balanceCont {
+        position: absolute;
+        width: 100%;
+        left: 0;    
+        top: 0;
+        text-align: center;
+        padding: 70rpx 0 0;
+        box-sizing: border-box;
+    }
+    
+    
+    .balanceCont-name {
+        color: #717171;
+        margin-bottom: 20rpx;
+    }
+    
+    .balanceCont-number {
+        color: #ffd890;
+        font-size: 80rpx;
+        font-weight: 600;
+    }
+    
+    .balanceCont-number text {
+        font-size: 50rpx;
+        padding-right: 10rpx;
+    }
+    
+    .balanceUrl {
+        position: absolute;
+        right: 0;
+        top: 30rpx;
+        background-color: #37332d;
+        font-size: 28rpx;
+        border-radius: 40rpx 0 0 40rpx;
+        line-height: 68rpx;
+        border: 2rpx solid #887351;
+        padding-left: 30rpx;
+        color: #ead2a5;
+        display: flex;
+    }
+    
+    .balanceUrl image {
+        width: 54rpx;
+        height: 54rpx;
+        margin-top: 9rpx;
+    }
+    
+    /* 提现 */
+    .label {
+        background-color: white;
+        margin-bottom: 30rpx;
+        display: flex;
+        height: 100rpx;
+        line-height: 100rpx;
+    }
+    
+    .labelLeft {
+        display: flex;
+        flex: 1;
+    }
+    
+    .labelLeft-img {
+        width: 54rpx;
+        height: 54rpx;
+        margin: 23rpx 20rpx;
+    }
+    
+    .labelLeft-arrow {
+        width: 44rpx;
+        height: 44rpx;
+        margin: 28rpx 0;
+    }
+    
+    /* 账变记录 */
+    .record-title {
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        color: #404040;
+        font-weight: 600;
+        font-size: 36rpx;
+        line-height: 60prx;
+        margin: 40rpx 0 30rpx;
+        flex: 1;
+    }
+    
+    .record-list {
+        background-color: #ffffff;
+        margin-bottom: 50rpx;
+        padding: 0 30rpx 20rpx 30rpx;
+        box-sizing: border-box;
+        border-top: 2rpx solid #e9e9e9;
+        border-bottom: 2rpx solid #e9e9e9;
+        position: relative;
+    }
+    
+    .accounts-more {
+        position: absolute;
+        bottom: -20rpx;
+        left: calc(50% - 40rpx);
+        width: 80rpx;
+        height: 40rpx;
+        text-align: center;
+        border-radius: 10rpx;
+        z-index: 9;
+        background-color: #ffffff;
+        border: #e9e9e9 2rpx solid;
+    }
+    
+    .accounts-more image {
+        width: 28rpx;
+        height: 28rpx;
+        margin: 8rpx 26rpx;
+    }
+    
+    .accounts-title {
+        position: relative;
+        padding: 30rpx 0 30rpx 35rpx;
+    }
+    
+    .accounts-title::after {
+        position: absolute;
+        content: '';
+        left: 6rpx;
+        top: 37%;
+        width: 8rpx;
+        height: 30%;
+        background-color: #000000;
+    }
+    
+    .accounts-user {
+        color: #838383;
+        display: flex;
+        border-top: 2rpx solid #f5f5f5;
+        padding: 30rpx 0;
+    }
+    
+    .accounts-user text {
+        display: block;
+        margin-bottom: 20rpx;
+    }
+    
+    .accounts-user-icon {
+        width: 36rpx;
+        height: 36rpx;
+        margin-right: 20rpx;
+        margin-top: 4rpx;
+    }
+    
+    
+    /* 暂无内容 */
+    .recommend-hint {
+        text-align: center;
+        color: #999;
+        padding: 100rpx 0;
+    }
+    
+    .recommend-hint image {
+        width: 200rpx;
+        height: 200rpx;
+        border-radius: 50%;
+        margin-bottom: 20rpx;
+    }
+
+</style>
diff --git a/pages/account/myBalance_list.vue b/pages/account/myBalance_list.vue
new file mode 100644
index 0000000..1507657
--- /dev/null
+++ b/pages/account/myBalance_list.vue
@@ -0,0 +1,155 @@
+<template>
+    <view>
+        <!-- 收益订单列表 -->
+        <view class="record" v-if="accounts.length > 0">
+            <view class="record-list" v-for="(item, index) in accounts" :key="index">
+                <view class="record-list-cont">
+                    <image class="record-list-img" src="/static/img/balance-icon-02.png"></image>
+                    <view class="record-list-top">
+                        <view class="record-list-left">
+                            <view class="record-list-name">
+                                {{ item.rule.title }}
+                            </view>
+                            <view class="record-list-time">
+                                {{ item.created_at }}
+                            </view>
+                        </view>
+                        <view class="record-list-right">
+                            {{ item.bonus > 0 ? '+' : '' }}{{ item.bonus }}
+                        </view>
+                    </view>
+                </view>
+                <view class="record-list-remark">
+                    {{ item.remark }}
+                </view>
+            </view>
+        </view>
+        <!-- 暂无内容 -->
+        <view class="recommend-hint" v-else>
+            <image src="/static/img/null_icon.png"></image>
+            <view>抱歉，目前暂无内容~</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { profitsNext } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                number      : '',           // 账户余额
+                accounts    : '',           // 账户列表
+                page: {
+                    has_more: false
+                },                          // 下一页
+                lodingStats: false          // 数据加载完渲染
+    		}
+    	},
+        onLoad(options) {
+            // 获取账变记录
+            this.accountInfo(options.type, options.id);
+        },
+        methods: {
+            // 账变记录
+            accountInfo(type, id, page) {
+                profitsNext({
+                    order_type: type,
+                    order_id: id,
+                    page: page
+                }).then(res=>{
+                    this.accounts = res          
+                }).catch(err => {});
+            },
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.page = pageNumber
+                    this.storesInfo('', pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 记录列表 */
+    .record-list {
+        background-color: #fff;
+        border-radius: 10rpx;
+        padding: 25rpx;
+        box-sizing: border-box;
+        margin-bottom: 30rpx;
+    }
+    
+    .record-list-img {
+        width: 50rpx;
+        height: 50rpx;
+        margin-top: 6rpx;
+    }
+    
+    .record-list-cont {
+        display: flex;
+        width: 100%;
+    }
+    
+    .record-list-top {
+        display: flex;
+        padding-left: 30rpx;
+        width: 100%;
+        box-sizing: border-box;
+    }
+    
+    .record-list-left {
+        flex: 1;
+        margin-right: 20rpx;
+    }
+    
+    .record-list-time {
+        margin-top: 10rpx;
+        font-size: 28rpx;
+        color: #999;
+    }
+    
+    .record-list-right {
+        color: red;
+    }
+    
+    .record-list-remark {
+        color: #333;
+        font-size: 28rpx;
+        margin: 30rpx 0 0;
+        background-color: #f5f5f5;
+        padding: 10rpx 15rpx;
+        display: inline-block;
+        border-radius: 4rpx;
+        position: relative;
+        box-sizing: border-box;
+        &::after {
+            position: absolute;
+            left: 20rpx;
+            top: -14rpx;
+            content: '';
+            width: 0;
+            height: 0;
+            border-left: 14rpx solid transparent;
+            border-right: 14rpx solid transparent;
+            border-bottom: 14rpx solid #f5f5f5;
+        }
+    }
+    
+    /* 暂无内容 */
+    .recommend-hint {
+        text-align: center;
+        color: #999;
+        padding: 100rpx 0;
+        image {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 50%;
+            margin-bottom: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/account/myProfit.vue b/pages/account/myProfit.vue
new file mode 100644
index 0000000..48ff898
--- /dev/null
+++ b/pages/account/myProfit.vue
@@ -0,0 +1,1030 @@
+<template>
+    <view>
+        <view class="profigHead">
+            <view class="profigHead-user">
+                <image :src="profitUser.avatar" mode="aspectFill"></image>{{ profitUser.nickname }}的收益
+            </view>
+            <image class="profigHead-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/profigLabel_back.png" mode="widthFix"></image>
+        </view>
+        
+        <view class="profigCont">
+            <view class="profigLabel">
+                <view class="profigLabel-top">
+                    我在本时生活总收益！
+                </view>
+                <view class="profigLabel-balance">
+                    <view class="profigLabel-balance-left">
+                        <view class="profigLabel-balance-name">余额</view>
+                        <view class="profigLabel-balance-price" v-if="profitUser.account">￥<text>{{profitUser.account.balance}}</text></view>
+                    </view>
+                    <navigator hover-class="none" url="/pages/account/withdrawal_form" class="profigLabel-balance-withdrawal">提现</navigator>
+                </view>
+                <view class="profigLabel-list">
+                    <view class="profigLabel-list-label">
+                        <navigator hover-class="none" :url="'/pages/account/myProfit_list?name=share_product'" class="profigLabel-list-name">
+                            分享产品收益<image src="/static/img/profigLabel_row.png" mode="aspectFill"></image>
+                        </navigator>
+                        <view class="profigLabel-list-price">
+                            {{ profitFinance.share_product }}
+                        </view>
+                    </view>
+                    <view class="profigLabel-list-label">
+                        <navigator hover-class="none" :url="'/pages/account/myProfit_list?name=team_product'" class="profigLabel-list-name">
+                            团队产品消费收益<image src="/static/img/profigLabel_row.png" mode="aspectFill"></image>
+                        </navigator>
+                        <view class="profigLabel-list-price">
+                            {{ profitFinance.team_product }}
+                        </view>
+                    </view>
+                    <view class="profigLabel-list-label">
+                        <navigator hover-class="none" :url="'/pages/account/myProfit_list?name=share_Recharge'" class="profigLabel-list-name">
+                            分享储值收益<image src="/static/img/profigLabel_row.png" mode="aspectFill"></image>
+                        </navigator>
+                        <view class="profigLabel-list-price">
+                            {{ profitFinance.share_Recharge }}
+                        </view>
+                    </view>
+                    <view class="profigLabel-list-label">
+                        <navigator hover-class="none" :url="'/pages/account/myProfit_list?name=team_recharge'" class="profigLabel-list-name">
+                            团队储值收益<image src="/static/img/profigLabel_row.png" mode="aspectFill"></image>
+                        </navigator>
+                        <view class="profigLabel-list-price">
+                            {{ profitFinance.team_recharge }}
+                        </view>
+                    </view>
+                    <view class="profigLabel-list-label">
+                        <view class="profigLabel-list-name">
+                            达人总数
+                        </view>
+                        <view class="profigLabel-list-price">
+                            {{profitCount.leader}}
+                        </view>
+                    </view>
+                    <view class="profigLabel-list-label">
+                        <view class="profigLabel-list-name">
+                            用户总数
+                        </view>
+                        <view class="profigLabel-list-price">
+                            {{ profitCount.users }}
+                        </view>
+                    </view>
+                </view>
+                <view class="profigLabel-cash">
+                    <view class="profigLabel-cash-label">
+                        <view class="profigLabel-cash-name">
+                            总收益
+                        </view>
+                        <view class="profigLabel-cash-price">
+                            {{ profitFinance.all_profit }}
+                        </view>
+                    </view>
+                    <view class="profigLabel-cash-label">
+                        <navigator hover-class="none" :url="'/pages/account/withdrawal_record?status=end' + '&idx=2'" class="profigLabel-cash-name profigLabel-cash-active">
+                            已提现
+                        </navigator>
+                        <view class="profigLabel-cash-price">
+                            {{profitFinance.withdrawed}}
+                        </view>
+                    </view>
+                    <view class="profigLabel-cash-label">
+                        <navigator hover-class="none" :url="'/pages/account/withdrawal_record?status=init' + '&idx=1'" class="profigLabel-cash-name profigLabel-cash-active">
+                            提现中
+                        </navigator>
+                        <view class="profigLabel-cash-price">
+                            {{ profitFinance.withdrawing }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+        
+            <view class="profigTab">
+                <view class="profigTab-nav">
+                    <view class="profigTab-nav-name" :class="{active : changeStyle == 'report'}" :data-style="'report'"
+                        @tap="changeTabbar">收益报表</view>
+                    <view class="profigTab-nav-name" :class="{active : changeStyle == 'order'}" :data-style="'order'"
+                        @tap="changeTabbar">收益订单</view>
+                    <view class="profigTab-nav-name" :class="{active : changeStyle == 'team'}" :data-style="'team'"
+                        @tap="changeTabbar">我的团队</view>
+                </view>
+                <view class="profigTab-list">
+                    <!-- 本月收益统计 -->
+                    <view class="profigReport" :class="{show : changeStyle == 'report'}">
+                        <view class="profigReport-module">
+                            <view class="profigReport-module-title">
+                                <view class="profigReport-module-name">
+                                    本月收益统计
+                                </view>
+                                <view class="profigReport-module-picker" v-if="incometMonths[monthsIndex]">
+                                    <picker @change="screenBind" :value="monthsIndex" :range-key="'name'"
+                                        :range="incometMonths">
+                                        {{ incometMonths[monthsIndex].name }}
+                                    </picker>
+                                    <image class="profigReport-module-icon" src="/static/icon/arrow_down.png"></image>
+                                </view>
+                            </view>
+                            <view class="profigReport-list">
+                                <view class="profigReport-list-label" v-if="incometFfinance.share_product">
+                                    <view class="profigReport-label-name">
+                                        分享产品收益
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometFfinance.share_product.this_month }}
+                                    </view>
+                                    <view class="profigLabel-label-billie" :class="{active : incometFfinance.share_product.this_month < 0}">
+                                        <image :src="incometFfinance.share_product.this_month >= 0 ? '/static/img/profig_billie_icon.png' : '/static/img/profig_billie_icon_active.png'"
+                                            mode="aspectFill"></image>
+                                        {{ incometFfinance.share_product.text }}
+                                    </view>
+                                </view>
+                                <view class="profigReport-list-label" v-if="incometFfinance.share_product">
+                                    <view class="profigReport-label-name">
+                                        团队产品消费收益
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{incometFfinance.team_product.this_month}}
+                                    </view>
+                                    <view class="profigLabel-label-billie" :class="{active : incometFfinance.team_product.this_month < 0}">
+                                        <image
+                                            :src="incometFfinance.team_product.this_month >= 0 ? '/static/img/profig_billie_icon.png' : '/static/img/profig_billie_icon_active.png'"
+                                            mode="aspectFill"></image>
+                                        {{ incometFfinance.team_product.text }}
+                                    </view>
+                                </view>
+                                <view class="profigReport-list-label" v-if="incometFfinance.share_product">
+                                    <view class="profigReport-label-name">
+                                        分享储值收益
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{incometFfinance.share_recharge.this_month}}
+                                    </view>
+                                    <view class="profigLabel-label-billie" :class="{active : incometFfinance.share_recharge.this_month < 0}">
+                                        <image
+                                            :src="incometFfinance.share_recharge.this_month >= 0 ? '/static/img/profig_billie_icon.png' : '/static/img/profig_billie_icon_active.png'"
+                                            mode="aspectFill"></image>
+                                        {{ incometFfinance.share_recharge.text }}
+                                    </view>
+                                </view>
+                                <view class="profigReport-list-label" v-if="incometFfinance.share_product">
+                                    <view class="profigReport-label-name">
+                                        团队储值收益
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometFfinance.team_recharge.this_month }}
+                                    </view>
+                                    <view class="profigLabel-label-billie" :class="{active : incometFfinance.team_recharge.this_month < 0}">
+                                        <image
+                                            :src="incometFfinance.team_recharge.this_month >= 0 ? '/static/img/profig_billie_icon.png' : '/static/img/profig_billie_icon_active.png'"
+                                            mode="aspectFill"></image>
+                                        {{ incometFfinance.team_recharge.text }}
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="profigReport-module profigReport-module-subset">
+                            <view class="profigReport-subset-name">
+                                新增团队统计
+                            </view>
+                            <view class="profigReport-list">
+                                <view class="profigReport-subset-label">
+                                    <view class="profigReport-label-name">
+                                        新增达人数
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometCount.leader }}
+                                    </view>
+                                </view>
+                                <view class="profigReport-subset-label">
+                                    <view class="profigReport-label-name">
+                                        新增用户数
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometCount.users }}
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="profigReport-module profigReport-module-subset">
+                            <view class="profigReport-subset-name">
+                                消费订单统计
+                            </view>
+                            <view class="profigReport-list">
+                                <view class="profigReport-subset-label">
+                                    <view class="profigReport-label-name">
+                                        产品消费
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometOrder.product }}
+                                    </view>
+                                </view>
+                                <view class="profigReport-subset-label">
+                                    <view class="profigReport-label-name">
+                                        储值消费
+                                    </view>
+                                    <view class="profigLabel-label-price">
+                                        {{ incometOrder.recharge }}
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+        
+                    <!-- 收益订单 -->
+                    <view class="profigOrder" :class="{show : changeStyle == 'order'}">
+                        <view class="profigOrder-module-title">
+                            <view class="profigOrder-module-name">
+                                共<text>{{ publicData.length }}</text>条订单
+                            </view>
+                            <view class="profigReport-module-picker">
+                                <picker @change="screenOrders" :value="ordersIndex" :range-key="'name'"
+                                    :range="ordersWay">
+                                    {{ ordersWay[ordersIndex].name }}
+                                </picker>
+                                <image class="profigReport-module-icon" src="/static/icon/arrow_down.png"></image>
+                            </view>
+                        </view>
+                        <block v-if="publicData.length > 0">
+                            <view class="profigOrder-list" v-for="(item, index) in publicData" :key="index">
+                                <view class="profigOrder-no">
+                                    <view class="profigOrder-no-name">
+                                        <text class="profigOrder-no-tips" :class="{active : item.type == 'recharge'}">
+                                            {{item.type == 'recharge' ? '储值' : '产品'}}
+                                        </text>
+                                        <block v-if="item.order">订单号：{{ item.order.orderid }}</block>
+                                        <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_time.png" mode="aspectFill"></image>
+                                    </view>
+                                    <view class="profigOrder-no-text">
+                                        {{ item.name }}
+                                    </view>
+                                </view>
+                                <view class="profigOrder-info">
+                                    <view class="profigOrder-label" v-if="item.user">
+                                        姓名：{{ item.user.nickname }}
+                                    </view>
+                                    <view class="profigOrder-label" v-if="item.user">
+                                        联系电话：{{ item.user.username }}
+                                    </view>
+                                    <view class="profigOrder-label profigOrder-label-color">
+                                        佣金：￥{{ item.bonus }}
+                                    </view>
+                                    <view class="profigOrder-label" v-if="item.order">
+                                        当前状态：{{ item.order.status }}
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="pagesLoding" v-if="lodingStats">
+                                <block v-if="page.has_more">
+                                    <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>
+                                    加载中...
+                                </block>
+                                <block v-else>
+                                    没有更多了~
+                                </block>
+                            </view>
+                        </block>
+                        <!-- 暂无内容 -->
+                        <view class="public-hint" v-else>
+                            <image src="/static/img/legal_tips.png"></image>
+                            <view>抱歉，目前暂无数据~</view>
+                        </view>
+                    </view>
+        
+                    <!-- 我的团队 -->
+                    <view class="profigTeam" :class="{show : changeStyle == 'team'}">
+                        <view class="profigTeam-module-title">
+                            <view class="profigOrder-module-title">
+                                <view class="profigOrder-module-name">
+                                    共<text>{{ publicData.length }}</text>人
+                                </view>
+                                <view class="profigReport-module-picker">
+                                    <picker @change="screenTeam" :value="teamIndex" :range-key="'name'" :range="teamWay">
+                                        {{ teamWay[teamIndex].name }}
+                                    </picker>
+                                    <image class="profigReport-module-icon" src="/static/icon/arrow_down.png"></image>
+                                </view>
+                            </view>
+                            <view class="profigTeam-ranking" :class="{'ascactive' : teamSort == 'asc', 'descactive' : teamSort == 'desc'}" @tap="teamTap">
+                                创收排行
+                            </view>
+                        </view>
+                        <block v-if="publicData.length > 0">
+                            <view class="profigTeam-list">
+                                <view class="profigTeam-nav">
+                                    <view class="profigTeam-name">达人姓名</view>
+                                    <view class="profigTeam-name">联系电话</view>
+                                    <view class="profigTeam-name">身份</view>
+                                    <view class="profigTeam-name">创收额</view>
+                                </view>
+                                <view class="profigTeam-label">
+                                    <view class="profigTeam-label-list" v-for="(item, index) in publicData" :key="index">
+                                        <view class="profigTeam-label-cont profigTeam-label-head">
+                                            <image :src="item.user.avatar" mode="aspectFill"></image>
+                                            <view class="nowrap profigTeam-label-name">{{ item.user.nickname }}</view>
+                                        </view>
+                                        <view class="nowrap profigTeam-label-cont">
+                                            {{ item.user.username }}
+                                        </view>
+                                        <view class="nowrap profigTeam-label-cont" v-if="item.user.identity">
+                                            {{ item.user.identity.identity_name }}
+                                        </view>
+                                        <view class="nowrap profigTeam-label-cont profigTeam-label-color">
+                                            {{ item.balance }}
+                                        </view>
+                                    </view>
+                                    <view class="pagesLoding" v-if="lodingStats">
+                                        <block v-if="page.has_more">
+                                            <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif"
+                                                mode="widthFix">
+                                            </image>
+                                            加载中...
+                                        </block>
+                                        <block v-else>
+                                            没有更多了~
+                                        </block>
+                                    </view>
+                                </view>
+                            </view>
+                        </block>
+                        <!-- 暂无内容 -->
+                        <view class="public-hint" v-else>
+                            <image src="/static/img/legal_tips.png"></image>
+                            <view>抱歉，目前暂无数据~</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { myProfit, myIncome, profitUrl } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                profitCount     : '',  //收益数据-人数
+                profitFinance   : '',  //收益数据-收益信息
+                profitUser      : '',  //收益数据-用户信息
+                incometCount    : '',  //收益统计-团队
+                incometFfinance : '',  //收益统计-收益
+                incometOrder    : '',  //收益统计-订单
+                incometMonths   : '',  //收益数据-月份列表
+                monthsIndex     : 1,  //账变记录筛选index 
+                monthsValue     : '',  //账变记录筛选value
+                changeStyle     : 'report', //tab默认选择类型
+                //收益订单筛选列表
+                ordersWay       : [
+                    {value: '0', name: "充值", type: 'recharge'},
+                    {value: '1', name: "产品", type: 'product'}
+                ],
+                ordersIndex     : 0, //收益订单筛选列表index
+                ordersValue     : 'recharge', //收益订单筛选列表value
+                publicData      : [],   //订单与团队  公共数据列表
+                //我的团队筛选列表
+                teamWay         : [
+                    {value: 0, name: "全部"},
+                    {value: 1, name: "用户"},
+                    {value: 2, name: "达人"}
+                ],
+                teamIndex       : 0, //我的团队筛选列表index
+                teamValue       : 0, //我的团队筛选列表value
+                teamSort        : 'asc', //我的团队排序
+                page            : {},    //下一页
+                lodingStats     : false, //加载状态
+    		}
+    	},
+        onLoad(options) {},
+        onShow() {
+            // 获取我的收益数据
+            this.profitInfo();
+
+            // 获取本月收益统计
+            this.incomeInfo();  
+        },
+        methods: {
+            // tab栏选择
+            changeTabbar(e) {
+                this.changeStyle = e.currentTarget.dataset.style
+                if(e.currentTarget.dataset.style == 'report'){
+                    // 获取收益统计
+                    this.incomeInfo();
+                    return
+                }
+                // 获取收益订单列表 + 我的团队列表
+                this.publicInfo();
+            },
+            
+            // 我的收益数据
+            profitInfo() {
+                myProfit().then(res=>{
+                    this.profitCount  = res.count
+                    this.profitFinance= res.finance
+                    this.profitUser   = res.user
+                }).catch(err=>{})
+            },
+            
+            // 收益统计
+            incomeInfo() {
+                myIncome(this.monthsValue).then(res=>{
+                    this.incometCount   = res.count
+                    this.incometFfinance= res.finance
+                    this.incometOrder   = res.order
+                    this.incometMonths  = res.months
+                    this.monthsIndex    = parseInt(res.this_month) - 1
+                }).catch(err=>{})
+            },
+            
+            // 收益订单列表 + 我的团队列表
+            publicInfo(page) {
+                let newStyle = this.changeStyle
+                let wechaUrl = ''  // 定义接口来源名称
+                let dataUrl  = ''  // 定义接口传输数据
+                if (newStyle == 'order') wechaUrl = 'data/orders'
+                if (newStyle == 'team') wechaUrl = 'data/teams'
+                if (newStyle == 'order') dataUrl = {type:this.ordersValue, page: page}
+                if (newStyle == 'team') dataUrl = {identity_id: this.teamValue, sort: this.teamSort, page: page}
+                profitUrl(wechaUrl, dataUrl).then(res => {
+                    let listArr = this.publicData,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+                    newData = listArr.concat(res.data)
+                    this.publicData  = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err=>{})
+            },
+            
+            // 月份选择
+            screenBind(val) {
+                let newValue  = parseInt(val.detail.value)
+                this.monthsValue = newValue + 1
+                this.monthsIndex = val.detail.value
+                // 获取收益统计
+                this.incomeInfo();
+            },
+        
+            // 订单类型选择
+            screenOrders(val) {
+                this.ordersIndex = val.detail.value,
+                this.ordersValue = this.ordersWay[val.detail.value].type
+                // 获取收益订单列表 + 我的团队列表
+                this.publicInfo();
+            },
+            
+            // 团队类型选择
+            screenTeam(val) {
+                this.teamIndex = val.detail.value,
+                this.teamValue = this.teamWay[val.detail.value].value
+                // 获取收益订单列表 + 我的团队列表
+                this.publicInfo();
+            },
+        
+            // 销量排序
+            teamTap () {
+                if (this.teamSort == 'asc') {
+                    this.teamSort = 'desc'
+                } else {
+                    this.teamSort = 'asc'
+                }
+                // 获取收益订单列表 + 我的团队列表
+                this.publicInfo();
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.publicInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #ececec;
+    }
+    
+    /* 头部 */
+    .profigHead {
+        background: linear-gradient(to bottom, #d0a76c 50%, #ffffff);
+        padding: 30rpx;
+        height: 300rpx;
+        width: 100%;
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+    
+    .profigHead-user {
+        line-height: 90rpx;
+        display: flex;
+        image {
+            width: 90rpx;
+            height: 90rpx;
+            margin-right: 20rpx;
+            border-radius: 50%;
+            border: 2rpx solid #ffffff;
+        }
+    }
+    
+    .profigHead-img {
+        opacity: .1;
+        width: 300rpx;
+        height: 300rpx;
+        position: absolute;
+        top: -50rpx;
+        right: 0;
+    }
+    
+    /* 内容 */
+    .profigCont {
+        position: absolute;
+        top: 140rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+        width: 100%;
+    }
+    
+    .profigLabel {
+        background-color: #2f2e2c;
+        border-radius: 20rpx;
+        overflow: hidden;
+    }
+    
+    .profigLabel-top {
+        background: linear-gradient(-250deg, #feecd4, #d5b687 90%);
+        padding: 0 30rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+    }
+    
+    .profigLabel-balance {
+        color: #efd8b8;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        display: flex;
+    }
+    
+    .profigLabel-balance-left {
+        flex: 1;
+        text {
+            font-size: 56rpx;
+            font-weight: 600;
+        }
+    }
+    
+    .profigLabel-balance-name {
+        font-size: 28rpx;
+    }
+    
+    .profigLabel-balance-withdrawal {
+        background-color: #fdebd3;
+        color: #000000;
+        display: inline-block;
+        height: 64rpx;
+        line-height: 64rpx;
+        padding: 0 40rpx;
+        border-radius: 60rpx;
+        margin-top: 40rpx;
+    }
+    
+    
+    .profigLabel-list-name {
+        margin-bottom: 10rpx;
+        display: flex;
+        image {
+            width: 20rpx;
+            height: 20rpx;
+            margin: 10rpx;
+        }
+    }
+    
+    .profigLabel-list {
+        padding: 30rpx 40rpx 0;
+        box-sizing: border-box;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 0;
+            width: 100%;
+            height: 0;
+            border-top: 2rpx dotted #665f54;
+        }
+        
+        &::after {
+            top: 0;
+        }
+        
+        &::before {
+            bottom: 0;
+        }
+    }
+    
+    .profigLabel-list,
+    .profigLabel-cash {
+        color: #ffffff;
+        position: relative;
+        overflow: hidden;
+        font-size: 28rpx;
+    }
+    
+    .profigLabel-list-label {
+        width: 50%;
+        float: left;
+        margin-bottom: 40rpx;
+    }
+    
+    .profigLabel-cash {
+        text-align: center;
+        padding: 30rpx 0;
+    }
+    
+    .profigLabel-cash-label {
+        width: 33.33%;
+        float: left;
+    }
+    
+    
+    .profigLabel-cash-name {
+        margin-bottom: 10rpx;
+        display: inline-block;
+        position: relative;
+    }
+    .profigLabel-cash-active::after {
+        position: absolute;
+        content: '';
+        left: 0;
+        bottom: 4rpx;
+        width: 100%;
+        height: 2rpx;
+        background-color: #ffffff;
+    }
+    
+    /* tab选项卡 */
+    .profigTab-nav {
+        display: flex;
+        line-height: 120rpx;
+    }
+    
+    .profigTab-nav-name {
+        width: 33.33%;
+        flex: 3;
+        text-align: center;
+        position: relative;
+        &.active {
+            color: #ffa30a;
+        }
+        &.active::after {
+            position: absolute;
+            content: '';
+            left: calc(50% - 30rpx);
+            bottom: 15rpx;
+            width: 60rpx;
+            height: 8rpx;
+            background-color: #ffa30a;
+        }
+    }
+    
+    /* tab收益报表内容 */
+    .profigReport,
+    .profigOrder,
+    .profigTeam {
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+        display: none;
+    }
+    
+    .profigReport.show,
+    .profigOrder.show,
+    .profigTeam.show {
+        display: block;
+    }
+    
+    .profigReport {
+        background-color: #ffffff;
+    }
+    
+    .profigReport-module {
+        padding: 30rpx 30rpx 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .profigReport-module-title {
+        display: flex;
+    }
+    
+    .profigReport-module-name {
+        flex: 1;
+        font-weight: 700;
+    }
+    
+    .profigReport-module-picker {
+        display: flex;
+        color: #797979;
+        font-size: 28rpx;
+        padding-top: 4rpx;
+    }
+    
+    .profigReport-module-icon {
+        width: 28rpx;
+        height: 28rpx;
+        margin: 6rpx 0 0 10rpx;
+    }
+    
+    .profigLabel-label-billie {
+        background-color: #fcf6ea;
+        border: 2rpx solid #f7e5db;
+        color: #f2863b;
+        padding-right: 20rpx;
+        height: 48rpx;
+        line-height: 48rpx;
+        font-size: 22rpx;
+        display: inline-flex;
+        border-radius: 10rpx;
+        &.active {
+            color: #00a915;
+            background-color: #efffec;
+            border: 2rpx solid #c9fbbf;
+        }
+        image {
+            width: 22rpx;
+            height: 22rpx;
+            margin: 12rpx 10rpx;
+        }
+    }
+    
+    .profigReport-list {
+        padding: 0 -20rpx;
+        width: 100%;
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+    
+    .profigReport-list-label {
+        width: calc(50% - 40rpx);
+        float: left;
+        margin: 40rpx 20rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .profigReport-label-name {
+        color: #999999;
+    }
+    
+    .profigLabel-label-price {
+        margin: 10rpx 0;
+        font-size: 34rpx;
+    }
+    
+    .profigReport-module-subset {
+        position: relative;
+        text-align: center;
+        &::after {
+            position: absolute;
+            content: '';
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 0;
+            border-top: 2rpx solid #e4e4e4;
+        }
+    }
+    
+    .profigReport-subset-name {
+        text-align: center;
+        margin: 0 auto 40rpx;
+        font-size: 28rpx;
+        background-color: #f1f1f1;
+        padding: 0 30rpx;
+        line-height: 64rpx;
+        display: inline-block;
+        border-radius: 10rpx;
+    }
+    
+    .profigReport-subset-label {
+        text-align: center;
+        width: 50%;
+        float: left;
+        font-size: 28rpx;
+    }
+    
+    /* tab收益订单内容 */
+    .profigOrder-list {
+        background-color: white;
+        padding: 30rpx;
+        box-sizing: border-box;
+        border-radius: 10rpx;
+        font-size: 28rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .profigOrder-no {
+        position: relative;
+        padding-bottom: 20rpx;
+        margin-bottom: 20rpx;
+        &::after {
+            position: absolute;
+            content: '';
+            left: 0;
+            width: 100%;
+            height: 0;
+            border-top: 2rpx dotted #e7e7e7;
+            bottom: 0;
+        }
+    }
+    
+    .profigOrder-no-name {
+        display: flex;
+        line-height: 44rpx;
+        image {
+            width: 32rpx;
+            height: 32rpx;
+            margin-left: 20rpx;
+            margin-top: 6rpx;
+        }
+    }
+    
+    .profigOrder-no-text {
+        color: #515151;
+        margin: 20rpx 0;
+    }
+    
+    .profigOrder-label {
+        line-height: 60rpx;
+    }
+    
+    .profigOrder-label-color {
+        color: #ffa30a;
+    }
+    
+    .profigOrder-no-tips {
+        background-color: green;
+        font-size: 22rpx;
+        color: #ffffff;
+        height: 36rpx;
+        line-height: 36rpx;
+        padding: 0 10rpx;
+        border-radius: 30rpx;
+        margin: 5rpx 10rpx 0 0;
+    }
+    
+    .profigOrder-no-tips.active {
+        background-color: #ffa30a;
+    }
+    
+    .profigOrder-module-title {
+        background-color: #ffffff;
+        border-radius: 10rpx;
+        display: flex;
+        box-sizing: border-box;
+        line-height: 80rpx;
+        margin-bottom: 30rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        font-size: 28rpx;
+    }
+    
+    .profigOrder-module-name {
+        flex: 1;
+        text {
+            color: #ffa30a;
+            padding: 0 5rpx;
+        }
+    }
+    
+    .profigOrder-module-title .profigReport-module-picker {
+        padding: 0;
+    }
+    
+    .profigOrder-module-title .profigReport-module-icon {
+        margin-top: 30rpx;
+    }
+    
+    /* tab我的团队内容 */
+    .profigTeam-module-title {
+        display: flex;
+        margin-bottom: 30rpx;
+    }
+    
+    .profigTeam .profigOrder-module-title {
+        flex: 1;
+        margin: 0 30rpx 0 0;
+    }
+    
+    .profigTeam-ranking {
+        width: 180rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        position: relative;
+        background-color: #ffffff;
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        border-radius: 10rpx;
+        color: green;
+        font-size: 28rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            right: 20rpx;
+            content: '';
+            width: 0;
+            height: 0;
+            border-left: 8rpx solid transparent;
+            border-right: 8rpx solid transparent;
+        }
+        
+        &::after {
+            bottom: 28rpx;
+            border-top: 8rpx solid grey;
+        }
+        
+        &::before {
+            top: 28rpx;
+            border-bottom: 8rpx solid grey;
+        }
+        
+        &.ascactive::after {
+            border-top: 8rpx solid green;
+        }
+        
+        &.descactive::before {
+            border-bottom: 8rpx solid green;
+        }
+    }
+    
+    .profigTeam-list {
+        margin-top: 30rpx;
+    }
+    
+    .profigTeam-nav {
+        background-color: #ffffff;
+        border-radius: 10rpx;
+        display: flex;
+        line-height: 80rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .profigTeam-name {
+        flex: 4;
+        text-align: center;
+        width: 25%;
+        font-size: 28rpx;
+    }
+    
+    .profigTeam-label {
+        background-color: #ffffff;
+        border-radius: 10rpx;
+        font-size: 26rpx;
+    }
+    
+    .profigTeam-label-list {
+        display: flex;
+        border-bottom: 2rpx solid #e8e8e8;
+        &:last-child {
+            border: none;
+        }
+    }
+    
+    .profigTeam-label-cont {
+        line-height: 110rpx;
+        flex: 4;
+        width: 25%;
+        text-align: center;
+    }
+    
+    .profigTeam-label-head {
+        display: flex;
+        image {
+            width: 50rpx;
+            height: 50rpx;
+            border-radius: 50%;
+            margin: 30rpx 20rpx;
+        }
+    }
+    
+    .profigTeam-label-name {
+        width: calc(100% - 90rpx);
+    }
+    
+    .profigTeam-label-color {
+        color: #ffa30a;
+    }
+    
+    .public-hint {
+        background-color: #ffffff;
+        border-radius: 10rpx;
+        text-align: center;
+        padding: 60rpx 0;
+        color: #999;
+        font-size: 28rpx;
+        image {
+            width: 160rpx;
+            height: 160rpx;
+            margin: 0 auto 20rpx;
+        }
+    }
+</style>
diff --git a/pages/account/myProfit_list.vue b/pages/account/myProfit_list.vue
new file mode 100644
index 0000000..721edeb
--- /dev/null
+++ b/pages/account/myProfit_list.vue
@@ -0,0 +1,178 @@
+<template>
+    <view>
+        <block v-if="publicData.length > 0">
+            <view class="record-list" v-for="(item, index) in publicData" :key="index">
+                <view class="record-top">
+                    <view class="record-way">{{ item.name }}</view>
+                    <view class="record-label-status">￥{{ item.bonus }}</view>
+                </view>
+                <view class="record-cont">
+                    <view class="record-label">
+                        <view class="record-label-name">时间</view>
+                        <view class="record-label-time">{{ item.created_at }}</view>
+                    </view>
+                    <view class="record-label">
+                        <view class="record-label-name">状态</view>
+                        <view class="record-label-time">{{ item.order.status }}</view>
+                    </view>
+                </view>
+                <view class="record-source">
+                    <view class="record-source-name">收益来源</view>
+                    <view class="record-source-cont">
+                        <image class="record-source-img" :src="item.source.avatar" mode="aspectFill"></image>
+                        <view class="record-source-info">
+                            <view class="record-source-nickname">{{ item.source.nickname }}</view>
+                            <view class="record-source-tel">{{ item.source.username }}</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="pagesLoding" v-if="lodingStats">
+                <block v-if="page.has_more">
+                    <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>加载中...
+                </block>
+                <block v-else>
+                    没有更多了~
+                </block>
+            </view>
+        </block>
+        <!-- 暂无内容 -->
+        <view class="pack-center pages-hint" v-else>
+            <image src="/static/img/legal_tips.png"></image>
+            <view>抱歉，目前暂无记录~</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { profitLogs } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                name        : '',    //权益名
+                publicData  : [],    //权益列表
+                page        : {},    //下一页
+                lodingStats : false ,//加载状态
+            }
+    	},
+        onLoad(options) {
+            this.name = options.name
+            
+            // 获取收益列表
+            this.profitInfo();
+        },
+        methods: {
+            // 收益列表
+            profitInfo(page) {
+                profitLogs({
+                    name: this.name,
+                    page: page
+                }).then(res=>{
+                    let listArr = this.publicData,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+                    newData = listArr.concat(res.data)
+                   this.publicData  = newData
+                   this.page        = res.page
+                   this.lodingStats = false
+                   uni.stopPullDownRefresh()
+                }).catch(err=>{})
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.profitInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 记录列表 */
+    .record-list {
+        background-color: #fff;
+        border-radius: 10rpx;
+        margin: 30rpx;
+    }
+    
+    .record-top {
+        display: flex;
+        padding: 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .record-way {
+        flex: 1;
+    }
+    
+    .record-take {
+        font-weight: 600;
+    }
+    
+    .record-cont {
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        color: #999;
+        font-size: 28rpx;
+    }
+    
+    .record-label {
+        display: flex;
+        line-height: 70rpx;
+    }
+    
+    .record-label-name {
+        flex: 1;
+    }
+    
+    .record-label-status {
+        color: red;
+    }
+    
+    .record-source {
+        border-top: 10rpx solid #f7f7f7;
+        margin-top: 20rpx;
+    }
+    
+    .record-source-name {
+        background: #f7f7f7;
+        color: #000;
+        width: 140rpx;
+        text-align: center;
+        line-height: 60rpx;
+        margin: 0 auto;
+        font-size: 28rpx;
+    }
+    
+    .record-source-cont {
+        position: relative;
+        padding: 40rpx 30rpx 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .record-source-img {
+        width: 70rpx;
+        height: 70rpx;
+        border-radius: 50%;
+    }
+    
+    .record-source-info {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        padding: 40rpx 30rpx 20rpx 120rpx;
+        box-sizing: border-box;
+        line-height: 70rpx;
+        display: flex;
+    }
+    
+    .record-source-nickname {
+        flex: 1;
+    }
+</style>
diff --git a/pages/account/recharge.vue b/pages/account/recharge.vue
new file mode 100644
index 0000000..1262c77
--- /dev/null
+++ b/pages/account/recharge.vue
@@ -0,0 +1,28 @@
+<template>
+    <view>
+        
+    </view>
+</template>
+
+<script>
+    import { create, store } from '@/apis/interfaces/recharge'
+    export default {
+    	data() {
+    		return {
+                
+            }
+        },
+        onLoad(options) {
+            // 获取充值列表
+            create().then(res=>{
+            })
+        },
+        onShow() {
+        },
+        methods:{
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/pages/account/withdrawal_form.vue b/pages/account/withdrawal_form.vue
new file mode 100644
index 0000000..15c6de8
--- /dev/null
+++ b/pages/account/withdrawal_form.vue
@@ -0,0 +1,167 @@
+<template>
+    <view>
+        <view class="withdrawal">
+            <image class="withdrawal-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/withdrawal_icon.png"></image>
+            <view class="withdrawal-price">{{ balance }}</view>
+            <view class="withdrawal-name">（我的账户余额）</view>
+        </view>
+        
+        <view class="withdrawalTips">
+            当前现金金额低于2元不可提现，每次提现的额度不低于2元，提现手续费按照到账周期收取
+        </view>
+        
+        <view class="withdrawalForm">
+            <form @submit="formSubmit">
+                <view class="withdrawalForm-label">
+                    <view class="withdrawalForm-label-name">提现金额</view>
+                    <input type="digit" :value="amount" placeholder="请输入提现金额" @input="getAmount" />
+                </view>
+                <view class="withdrawalForm-label">
+                    提现费用收取，手续费{{ tax }}%
+                </view>
+                <button class="withdrawalForm-btn" formType="submit" :disabled="disabled">立即提现</button>
+                <navigator class="withdrawalForm-url" hover-class="none" :url="'/pages/account/withdrawal_record?status=' + '' + '&idx=0'">提现记录</navigator>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { withdraws, withdrawsForm } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                balance     : '',   //余额
+                tax         : '',   //手续费
+                amount      : '',   //提现金额
+                disabled    : false //按钮状态
+    		}
+    	},
+        onLoad(options) {
+            // 获取提现前置账户信息
+            this.withdrawsInfo();
+        },
+        methods: {
+            // 提现前置账户信息
+            withdrawsInfo() {
+                withdraws().then(res=>{
+                    this.balance = res.balance
+                    this.tax     = res.tax
+                }).catch(err=>{})
+            },
+        
+            // 获取提现金额
+            getAmount (val) {
+                var money;
+                if (/^(\d?)+(\.\d{0,1})?$/.test(val.detail.value)) { //正则验证，提现金额小数点后不能大于两位数字
+                    money = val.detail.value;
+                } else {
+                    money = val.detail.value.substring(0, val.detail.value.length - 1);
+                }
+                this.amount = money
+            },
+        
+            // 提现表单填写
+            formSubmit(e) {
+                let newAmount = this.amount
+                if(newAmount > 1) {
+                    withdrawsForm({
+                        amount: newAmount,
+                        channel: "mini"
+                    }).then(res=>{
+                        this.disabled = true
+            
+                        uni.showToast({
+                            title: '提现申请提交成功',
+                        })
+            
+                        setTimeout(()=>{
+                            uni.redirectTo({
+                                url: "/pages/account/withdrawal_record?status=''&idx=0"
+                            })
+                        },2000)
+                       
+                    }).catch(err=>{})
+                }else {
+                    uni.showToast({
+                        title: '金额不得低于2元',
+                        icon: 'none'
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 余额 */
+    .withdrawal{
+        background-color: #fff;
+        text-align: center;
+        padding: 30rpx 0;
+    }
+    
+    .withdrawal-img {
+        width: 180rpx;
+        height: 180rpx;
+    }
+    
+    .withdrawal-price {
+        color: #df0000;
+        font-size: 50rpx;
+        margin: 10rpx 0;
+    }
+    
+    .withdrawal-name {
+        font-size: 28rpx;
+        color: #666666;
+    }
+    
+    .withdrawalTips {
+        padding: 30rpx 20rpx;
+        box-sizing: border-box;
+        font-size: 28rpx;
+        color: #b9c6d2;
+    }
+    
+    .withdrawalForm-label {
+        background-color: #fff;
+        margin-bottom: 30rpx;
+        padding: 30rpx 20rpx;
+        box-sizing: border-box;
+        display: flex;
+        input {
+            background-color: transparent;
+            padding-left: 50rpx;
+            box-sizing: border-box;
+        }
+    }
+    
+    .withdrawalForm-btn {
+        background-color: #ff6d6d;
+        width: calc(100% - 40rpx) !important;
+        color: #fff;
+        height: 90rpx !important;
+        line-height: 90rpx !important;
+        padding: 0;
+        margin-top: 40rpx;
+        font-size: 32rpx;
+    }
+    
+    .withdrawalForm-url {
+        text-align: center;
+        width: 100%;
+        margin-top: 20rpx;
+        position: relative;
+        color: #ff6d6d;
+        &::after {
+            position: absolute;
+            content: '';
+            left: calc(50% - 60rpx);
+            bottom: 0rpx;
+            width: 120rpx;
+            height: 4rpx;
+            background-color: #ff6d6d;
+        }
+    }
+</style>
diff --git a/pages/account/withdrawal_record.vue b/pages/account/withdrawal_record.vue
new file mode 100644
index 0000000..6f8a1f3
--- /dev/null
+++ b/pages/account/withdrawal_record.vue
@@ -0,0 +1,203 @@
+<template>
+    <view>
+        <view class="profigOrder-module-title">
+            <view class="profigOrder-module-name">
+                提现列表
+            </view>
+            <view class="profigReport-module-picker">
+                <picker @change="screenWithdrawal" :value="WithdrawalIndex" :range-key="'name'" :range="WithdrawalWay">
+                    {{ WithdrawalWay[WithdrawalIndex].name }}
+                </picker>
+                <image class="profigReport-module-icon" src="/static/icon/arrow_down.png"></image>
+            </view>
+        </view>
+        
+        <view v-if="accounts.length > 0" class="recordCont">
+            <view class="record-list" v-for="(item, index) in accounts" :key="index">
+                <view class="record-top">
+                    <view class="record-way">{{ item.way }}</view>
+                    <view class="record-take">+{{ item.take }}</view>
+                </view>
+                <view class="record-cont">
+                    <view class="record-label">
+                        <view class="record-label-name">提现时间</view>
+                        <view class="record-label-time">{{ item.create_at }}</view>
+                    </view>
+                    <view class="record-label">
+                        <view class="record-label-name">提现状态</view>
+                        <view class="record-label-status" :class="{'record-label-green' : item.status.status == 3}">
+                            {{ item.status.status_text }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="pagesLoding" v-if="lodingStats">
+                <block v-if="page.has_more">
+                    <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>加载中...
+                </block>
+                <block v-else>
+                    没有更多了~
+                </block>
+            </view>
+        </view>
+        <!-- 暂无内容 -->
+        <view class="pack-center pages-hint" v-else>
+            <image src="/static/img/legal_tips.png"></image>
+            <view>抱歉，目前暂无记录~</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { withdrawsList } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                accounts    : [],       // 列表
+                page        : {},       // 分页信息
+                lodingStats : false,    // 加载状态
+                WithdrawalWay         : [
+                    {value: '', name: "全部", status: ''},
+                    {value: 0, name: "提现中", status: 'init'},
+                    {value: 1, name: "已提现", status: 'end'}
+                ],
+                WithdrawalIndex  : 0,       // 收益订单筛选列表index
+                WithdrawalValue  : 'init'  // 收益订单筛选列表value
+    		}
+    	},
+        onLoad(options) {
+            this.WithdrawalValue = options.status
+            this.WithdrawalIndex = parseInt(options.idx)
+        },
+        onShow() {
+            // 获取提现列表
+            this.recordInfo();
+        },
+        methods: {
+            // 提现列表
+            recordInfo(page) {
+                withdrawsList({
+                    status: this.WithdrawalValue,
+                    page: page
+                }).then(res=>{
+                    let listArr = this.accounts,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+                    newData = listArr.concat(res.data)
+                    this.accounts = newData
+                    this.page     = res.page       
+                }).catch(err => {});
+            },
+        
+            // 团队类型选择
+            screenWithdrawal(val) {
+                this.WithdrawalIndex = val.detail.value
+                this.WithdrawalValue = this.WithdrawalWay[val.detail.value].status
+                // 获取提现列表
+                this.recordInfo();
+            },
+        
+            // 页面相关事件处理函数--监听用户下拉动作
+            onPullDownRefresh() {
+                // 获取提现列表
+                this.recordInfo();
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    // 获取提现列表
+                    this.recordInfo(pageNumber);
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    
+    /* 记录列表 */
+    .record-list {
+        background-color: #fff;
+        border-radius: 10rpx;
+        padding: 25rpx 25rpx 10rpx;
+        box-sizing: border-box;
+        margin: 30rpx;
+    }
+    
+    .record-top {
+        display: flex;
+    }
+    
+    .record-way {
+        flex: 1;
+    }
+    
+    .record-take {
+        font-weight: 600;
+    }
+    
+    .record-cont {
+        margin-top: 20rpx;
+        color: #999;
+        font-size: 28rpx;
+    }
+    
+    .record-label {
+        display: flex;
+        line-height: 70rpx;
+    }
+    
+    .record-label-name {
+        flex: 1;
+    }
+    
+    .record-label-status {
+        color: red;
+    }
+    
+    .record-label-status.record-label-green {
+        color: green;
+    }
+    
+    .profigOrder-module-title {
+        position: fixed;
+        width: 100%;
+        left: 0;
+        top: 0;
+        z-index: 9;
+        background-color: #ffffff;
+        display: flex;
+        box-sizing: border-box;
+        height: 80rpx;
+        line-height: 80rpx;
+        margin-bottom: 30rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .profigOrder-module-name {
+        font-weight: 600;
+        flex: 1;
+    }
+    
+    .profigReport-module-picker {
+        display: flex;
+        color: #797979;
+        font-size: 28rpx;
+        padding-top: 4rpx;
+    }
+    
+    .profigReport-module-icon {
+        width: 28rpx;
+        height: 28rpx;
+        margin: 26rpx 0 0 10rpx;
+    }
+    
+    .recordCont {
+        margin-top: 110rpx;
+    }
+</style>
diff --git a/pages/activate/activate.vue b/pages/activate/activate.vue
new file mode 100644
index 0000000..af07f46
--- /dev/null
+++ b/pages/activate/activate.vue
@@ -0,0 +1,196 @@
+<template>
+    <view>
+        <!-- 卡激活 -->
+        <view class="activate-back">
+        	<image class="activate-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/activate-back.jpg" mode="aspectFill"></image>
+        	<view class="activate-cont">
+        		<view class="activate-title">消费红包【储值卡】</view>
+        		<form @submit="cardform" class="activate-form">
+        			<view class="activate-label">
+        				<label>输入激活卡号（16位） <text>例：Byt2020090800020</text></label>
+        				<input maxlength="16" name="code"></input>
+        			</view>
+        			<view class="activate-label">
+        				<label>输入激活卡密（16位） <text>例：8888 8888 8888 8888</text></label>
+        				<input maxlength="19" type="pass" @input="carmiTab" :value="carmi"/>
+        			</view>
+        			<view class="activate-btn">
+        				<button form-type="submit">立即激活</button>
+        			</view>
+        		</form>
+        		<view class="activate-tips">
+        			<view class="activate-tips-title">温馨提示：</view>
+        			<view class="activate-tips-text">
+        				尊敬的会员：储值后，将开启您，愉快的消费之旅！
+        			</view>
+        		</view>
+        	</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { cards } from '@/apis/interfaces/auth'
+    export default {
+    	data() {
+    		return {
+                carmi: ''  // 卡密
+            }
+        },
+        onLoad(options) {},
+        methods:{
+            // 卡激活
+            cardform(e) {
+                cards({
+                    code: e.detail.value.code,
+                    code: this.carmi
+                }).then(res=>{
+                    // if(res.type == "silver") {
+                    //     app.globalData.userCurrent = 0
+                    // }else if(res.type == "gold") {
+                    //     app.globalData.userCurrent = 1
+                    // }else if(res.type == "drill") {
+                    //     app.globalData.userCurrent = 2
+                    // }else {
+                    //     return
+                    // }
+        
+                    // 写入缓存
+                    // uni.setStorage({
+                    //     key     : 'current',
+                    //     data    : app.globalData.userCurrent
+                    // })
+        
+                    uni.showToast({
+                        title: res.message,
+                        icon : 'none'
+                    })
+                    setTimeout(()=>{
+                        uni.switchTab({
+                            url: '/pages/user/index'
+                        })
+                    },2000)
+                })
+            },
+        
+            // 获取卡密
+            carmiTab(e){
+                var number = e.detail.value
+                var change = number.replace(/(\d{4})(?=\d)/g, "$1-");
+                this.carmi = change
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 卡激活 */
+    .activate-back {
+        width: 100%;
+        height: 100vh;
+        left: 0;
+        top: 0;
+        position: relative;
+        .activate-img {
+            position: relative;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            z-index: 2;
+        }
+        .activate-cont {
+            position: absolute;
+            top: 0;
+            left: 0;
+            padding: 60rpx;
+            width: 100%;
+            box-sizing: border-box;
+            z-index: 9;
+            .activate-title {
+                font-size: 60rpx;
+                font-weight: 600;
+                text-align: center;
+                margin: 20rpx 0 100rpx;
+            }
+            .activate-label, .activate-pass {
+                margin-bottom: 60rpx;
+            }
+            .activate-label label, .activate-pass label {
+                margin-bottom: 40rpx;
+                display: block;
+                font-weight: 600;
+                font-size: 34rpx;
+            }
+            .activate-label input, .activate-pass input {
+                background: rgba(255, 255, 255, .3);
+                border-radius: 60rpx;
+                height: 90rpx;
+                line-height: 90rpx;
+                padding: 0 1rem;
+                box-sizing: border-box;
+                box-shadow: inset -2px 2px 4px 1.5px rgba(0, 0, 0, 0.7);
+            }
+            .activate-label input {
+                width: 100%;
+            }
+            .activate-label text {
+                display: block;
+                font-size: 32rpx;
+                margin-top: 10rpx;
+                font-weight: normal;
+            }
+            .activate-entry {
+                display: flex;
+                line-height: 80rpx;
+                color: #fff;
+                font-weight: 600;
+                input {
+                    background: #fff;
+                    border-radius: 60rpx;
+                    width: calc(25% - 1rem);
+                    margin: 0 .5rem;
+                    height: 80rpx;
+                    line-height: 80rpx;
+                }
+            }
+            .activate-btn {
+                width: 100%;
+                height: 90rpx;
+                border: none;
+                margin: 2rem 0 2.2rem;
+                button {
+                    width: 100% !important;
+                    height: 100%;
+                    line-height: 90rpx;
+                    border-radius: 50rpx;
+                    background: #000;
+                    border: none;
+                    font-size: 40rpx;
+                    color: #fff;
+                    margin: 0;
+                    padding: 0;
+                }
+            }
+            .activate-tips {
+                color: #000;
+                font-weight: 600;
+                font-size: 32rpx;
+                .activate-tips-text {
+                    line-height: 46rpx;
+                    margin-top: 20rpx;
+                }
+                .activate-tips-img {
+                    width: 240rpx;
+                    height: 240rpx;
+                    border-radius: 50%;
+                    margin: 2rem auto 0;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/auth/login.vue b/pages/auth/login.vue
new file mode 100644
index 0000000..084af26
--- /dev/null
+++ b/pages/auth/login.vue
@@ -0,0 +1,277 @@
+<template>
+    <view>
+        <image class="loginBack" src="/static/img/login_back.png" mode="aspectFill"></image>
+        <view class="login">
+            <view class="header">
+                <view class="header-btn" @click="loginBack">
+                    <uni-icons type="closeempty" size="28" color="#666"></uni-icons>
+                </view>
+            </view>
+            <view class="title">
+                <image class="title-logo" src="../../static/img/logo.png" mode="aspectFill"></image>
+                <view class="title-name">欢迎使用，本时生活</view>
+            </view>
+            <view class="form">
+                <view class="inputs">
+                    <input type="number" v-model="phone" @input="getNameValue" placeholder="输入手机号码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" @input="getCodeValue" :value="code" placeholder="输入手机验证码" />
+                    <button type="default" @click="getCode" :disabled="disabled">
+                        {{ codename }}
+                    </button>
+                </view>
+                <button
+                    type="default"
+                    class="button"
+                    :disabled="phone.length <= 0 || code.length <= 0"
+                    @click="forgetlogin"
+                >登录</button>
+                <view class="login-wechat">
+                    <navigator hover-class="none" url="/pages/auth/password_login" class="login-wechat-btn">
+                        密码登录
+                    </navigator>
+                    <navigator hover-class="none" url="/pages/auth/register" class="login-wechat-btn login-register">
+                        账户注册
+                    </navigator>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	import { auth, send } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+				codename    : '获取验证码',
+                phone       : '', // 手机号
+                code        : '', // 验证码
+                disabled    : false ,// 按钮状态
+                way         : '' // 登录方式-活动
+			};
+		},
+		onLoad(options){
+            // 登录方式-活动
+            this.way = options.way
+		},
+		onUnload() {},
+		methods:{
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.phone,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({
+                        mobile : mobileNo,
+                        channel: 'LOGIN'
+                    }).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                            }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // forgetlogin
+            forgetlogin(e){
+                uni.showLoading({
+                	title: '登录中...'
+                })
+                auth({
+                    mobile: this.phone,
+                    code: this.code,
+                    type: ''
+                }).then(res=>{
+                    // 清空分享信息
+                    if(this.way == 'shareLogin'){
+                        getApp().globalData.shareObj = {
+                            type    : '',
+                            goodsId : '',
+                            userId  : ''
+                        }
+                    }
+                    
+                    // 存储登录token
+                    this.$store.commit('setToken', res.token)
+                    uni.hideLoading()
+                    
+                    // 若没有登录密码则跳转设置登录密码页面
+                    if(res.has_password == false) {
+                        uni.redirectTo({
+                            url: '/pages/auth/password'
+                        })
+                        return
+                    }
+                    
+                    // 设置过登录密码,则跳到首页
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : 'none'
+                    })
+                })
+            }
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: white;
+	}
+</style>
+<style lang="scss" scoped>
+    .loginBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+    }
+    
+	.login{
+        width: 100%;
+        z-index: 2;
+		padding: var(--status-bar-height) 20rpx * 4 0;
+        box-sizing: border-box;
+        position: fixed;
+        top: 140rpx;
+        left: 0;
+		.header{
+			padding: (20rpx * 2) 0 (20rpx * 5);
+			.header-btn{
+				display: none;
+				height: 90rpx;
+				width: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				margin-left: -30rpx;
+			}
+		}
+		.title {
+			margin-bottom: 20rpx * 5;
+			font-size: 30rpx;
+			font-weight: bold;
+            text-align: center;
+			color: #000;
+            .title-logo {
+                width: 160rpx;
+                height: 160rpx;
+                margin-bottom: 20rpx;
+            }
+		}
+		// 表单
+		.form{
+			.inputs{
+				margin-bottom: 20rpx * 2;
+                box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .2);
+                border-radius: 80rpx;
+                padding: 0 30rpx;
                box-sizing: border-box;
+				height: 90rpx;
+				line-height: 90rpx;
+				display: flex;
+				input {
+					flex: 1;
+					height: 90rpx;
+					font-size: 30rpx;
+				}
+				button{
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					background: white;
+					color: #188600;
+					margin-left: 20rpx;
+                    background: transparent;
+					padding: 0;
+					&:after{
+						border: none;
+					}
+					&[disabled]{
+						color: #C8C7CC;
+					}
+				}
+			}
+			.button{
+				margin-top: 20rpx * 4;
+				background: #000000;
+				color: white;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 80rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				border: none;
+                box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .7);
+				&[disabled]{
+					background: #c1c1c1;
+					box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .1);
+				}
+			}
+		}
+		// 微信快捷登录
+		.login-wechat{
+		    position: fixed;
+		    width: 100%;
+		    left: 0;
+		    bottom: 0;
+		    height: 140rpx;
+		    display: flex;
+		    padding: 0 100rpx;
+		    box-sizing: border-box;
+			.login-wechat-btn {
+		        width: 50%;
+				display: inline-block;
+			}
+		    .login-register {
+		        text-align: right;
+		    }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/auth/password.vue b/pages/auth/password.vue
new file mode 100644
index 0000000..1a62694
--- /dev/null
+++ b/pages/auth/password.vue
@@ -0,0 +1,170 @@
+<template>
+    <view>
+        <view @click="homeUrl" class="skip" v-if="type != 'forgetType'">
+            跳过，暂不设置
+        </view>
+        <view class="login">
+            <view class="header">
+                <view class="header-btn" @click="loginBack">
+                    <uni-icons type="closeempty" size="28" color="#666"></uni-icons>
+                </view>
+            </view>
+            <view class="title">
+                设置登录密码
+            </view>
+            <view class="form">
+                <view class="inputs">
+                    <input type="number" v-model="password" password placeholder="输入登录密码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" v-model="confirmation" password placeholder="再次输入登录密码" />
+                </view>
+                <button
+                    type="default"
+                    class="button"
+                    @click="setupGo"
+                >确定</button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	import { passSetup } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+				password    : '', // 设置密码
+                confirmation: '', // 确认密码
+                type        : ''  // 类型
+			};
+		},
+		onLoad(e){
+            this.type = e.type
+		},
+		methods:{
+            // 设置登录密码
+            setupGo() {
+                passSetup({
+                	password: this.password,
+                	password_confirmation: this.confirmation
+                }).then(res=>{
+                	uni.switchTab({
+                	    url: '/pages/index/index'
+                	})
+                }).catch(err => {
+                	uni.showToast({
+                		icon: 'none',
+                		title: err.message
+                	})
+                })
+            },
+            
+            // 跳转首页
+            homeUrl() {
+                uni.switchTab({
+                    url: '/pages/index/index'
+                })
+            }
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #f0f0f0;
+	}
+</style>
+<style lang="scss" scoped>
+    .loginBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+    }
+    
+	.login{
+        width: 100%;
+        z-index: 2;
+		padding: var(--status-bar-height) 20rpx * 4 0;
+        box-sizing: border-box;
+        position: fixed;
+        top: 100rpx;
+        left: 0;
+		.header{
+			padding: (20rpx * 2) 0 (20rpx * 5);
+			.header-btn{
+				display: none;
+				height: 90rpx;
+				width: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				margin-left: -30rpx;
+			}
+		}
+		.title {
+			margin-bottom: 20rpx * 5;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: #000;
+		}
+		// 表单
+		.form{
+			.inputs{
+                background-color: #FFFFFF;
+				margin-bottom: 20rpx * 2;
+                border-radius: 10rpx;
+                padding: 0 30rpx;
                box-sizing: border-box;
+				height: 90rpx;
+				line-height: 90rpx;
+				display: flex;
+				input {
+					flex: 1;
+					height: 90rpx;
+					font-size: 30rpx;
+				}
+				button{
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					background: white;
+					color: #188600;
+					margin-left: 20rpx;
+                    background: transparent;
+					padding: 0;
+					&:after{
+						border: none;
+					}
+					&[disabled]{
+						color: #C8C7CC;
+					}
+				}
+			}
+			.button{
+				margin-top: 20rpx * 4;
+				background: #d82d36;
+				color: white;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 10rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				border: none;
+			}
+		}
+	}
+    
+    // 跳过
+    .skip {
+        position: fixed;
+        top: 0;
+        right: 0;
+        width: 100%;
+        text-align: right;
+        padding: 30rpx;
+        font-size: 28rpx;
+        box-sizing: border-box;
+        z-index: 99;
+        color: #7b7b7b;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/auth/password_login.vue b/pages/auth/password_login.vue
new file mode 100644
index 0000000..9cffd71
--- /dev/null
+++ b/pages/auth/password_login.vue
@@ -0,0 +1,203 @@
+<template>
+    <view>
+        <image class="loginBack" src="/static/img/login_back.png" mode="aspectFill"></image>
+        <view class="login">
+            <view class="header">
+                <view class="header-btn" @click="loginBack">
+                    <uni-icons type="closeempty" size="28" color="#666"></uni-icons>
+                </view>
+            </view>
+            <view class="title">
+                <image class="title-logo" src="../../static/img/logo.png" mode="aspectFill"></image>
+                <view class="title-name">欢迎使用，本时生活</view>
+            </view>
+            <view class="form">
+                <view class="inputs">
+                    <input type="number" v-model="mobile" @input="mobileValue" placeholder="输入手机号码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" v-model="password" @input="passwordValue" password placeholder="输入登录密码" />
+                </view>
+                <button
+                    type="default"
+                    class="button"
+                    :disabled="mobile.length <= 0 || password.length <= 0"
+                    @click="forgetlogin"
+                >登录</button>
+                <navigator class="forgetTips" url="/pages/auth/psssword_forget" hover-class="none">忘记密码？</navigator>
+                <view class="login-wechat">
+                    <navigator hover-class="none" url="/pages/auth/login" class="login-wechat-btn">
+                        短信快捷登录
+                    </navigator>
+                    <navigator hover-class="none" url="/pages/auth/register" class="login-wechat-btn login-register">
+                        账户注册
+                    </navigator>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	import { passlogin } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+                mobile      : '',   // 手机号
+                password    : '',   // 登录密码
+                disabled    : false // 按钮状态
+			};
+		},
+		onLoad(e){
+		},
+		onUnload() {},
+		methods:{
+            // mobileNo
+            mobileValue(e) {
+                this.mobile = e.detail.value
+            },
+            
+            // passwordNo
+            passwordValue(e) {
+                this.password = e.detail.value
+            },
+            
+            // forgetlogin
+            forgetlogin(e){
+                uni.showLoading({
+                	title: '登录中...'
+                })
+                passlogin({
+                    mobile: this.mobile,
+                    password: this.password
+                }).then(res=>{
+                    // 存储登录token
+                    this.$store.commit('setToken', res.token)
+                    uni.hideLoading()
+                    
+                    // 若没有登录密码则跳转设置登录密码页面
+                    if(res.has_password == false) {
+                        uni.redirectTo({
+                            url: '/pages/auth/password'
+                        })
+                        return
+                    }
+                    
+                    // 设置过登录密码,则跳到首页
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : 'none'
+                    })
+                })
+            }
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: white;
+	}
+</style>
+<style lang="scss" scoped>
+    .loginBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+    }
+    
+	.login{
+        width: 100%;
+        z-index: 2;
+		padding: var(--status-bar-height) 20rpx * 4 0;
+        box-sizing: border-box;
+        position: fixed;
+        top: 140rpx;
+        left: 0;
+		.header{
+			padding: (20rpx * 2) 0 (20rpx * 5);
+			.header-btn{
+				display: none;
+				height: 90rpx;
+				width: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				margin-left: -30rpx;
+			}
+		}
+		.title {
+			margin-bottom: 20rpx * 5;
+			font-size: 30rpx;
+			font-weight: bold;
+            text-align: center;
+			color: #000;
+            .title-logo {
+                width: 160rpx;
+                height: 160rpx;
+                margin-bottom: 20rpx;
+            }
+		}
+		// 表单
+		.form{
+			.inputs{
+				margin-bottom: 20rpx * 2;
+                box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .2);
+                border-radius: 80rpx;
+                padding: 0 30rpx;
                box-sizing: border-box;
+				height: 90rpx;
+				line-height: 90rpx;
+				display: flex;
+				input {
+					flex: 1;
+					height: 90rpx;
+					font-size: 30rpx;
+				}
+			}
+			.button {
+				margin-top: 20rpx * 4;
+				background: #000000;
+				color: white;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 80rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				border: none;
+                box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .7);
+                &[disabled]{
+                	background: #c1c1c1;
+                	box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .1);
+                }
+			}
+		}
+		// 微信快捷登录
+        .forgetTips {
+            text-align: right;
+            margin-top: 10px;
+        }
+		// 微信快捷登录
+		.login-wechat{
+		    position: fixed;
+		    width: 100%;
+		    left: 0;
+		    bottom: 0;
+		    height: 140rpx;
+		    display: flex;
+		    padding: 0 100rpx;
+		    box-sizing: border-box;
+			.login-wechat-btn {
+		        width: 50%;
+				display: inline-block;
+			}
+		    .login-register {
+		        text-align: right;
+		    }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/auth/psssword_forget.vue b/pages/auth/psssword_forget.vue
new file mode 100644
index 0000000..5a08479
--- /dev/null
+++ b/pages/auth/psssword_forget.vue
@@ -0,0 +1,198 @@
+<template>
+    <view>
+        <view class="login">
+            <view class="title">
+                身份验证
+            </view>
+            <view class="form">
+                <form @submit="forgetlogin">
+                	<view class="inputs">
+                	    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+                	</view>
+                	<view class="inputs">
+                        <input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+                        <button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+                	</view>
+                	<button class="button" form-type="submit">找回</button>
+                </form>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	import { send, auth } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            };
+		},
+		onLoad(e){},
+		methods:{
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || ''
+                    
+                auth({
+                    mobile: mobileNo,
+                    code: code,
+                    type: 'reset_password'
+                }).then(res => {
+                    this.$store.commit('setToken', res.token)
+                    uni.redirectTo({
+                        url: '/pages/auth/password?type=forgetType'
+                    })
+                }).catch(err =>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : 'none'
+                    })
+                })
+            }
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #f0f0f0;
+	}
+</style>
+<style lang="scss" scoped>
+    .loginBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+    }
+    
+	.login{
+        width: 100%;
+        z-index: 2;
+		padding: var(--status-bar-height) 20rpx * 4 0;
+        box-sizing: border-box;
+        position: fixed;
+        top: 100rpx;
+        left: 0;
+		.header{
+			padding: (20rpx * 2) 0 (20rpx * 5);
+			.header-btn{
+				display: none;
+				height: 90rpx;
+				width: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				margin-left: -30rpx;
+			}
+		}
+		.title {
+			margin-bottom: 20rpx * 5;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: #000;
+		}
+		// 表单
+		.form{
+			.inputs{
+                background-color: #FFFFFF;
+				margin-bottom: 20rpx * 2;
+                border-radius: 10rpx;
+                padding: 0 30rpx;
                box-sizing: border-box;
+				height: 90rpx;
+				line-height: 90rpx;
+				display: flex;
+				input {
+					flex: 1;
+					height: 90rpx;
+					font-size: 30rpx;
+				}
+				button{
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					background: white;
+					color: #188600;
+					margin-left: 20rpx;
+                    background: transparent;
+					padding: 0;
+					&:after{
+						border: none;
+					}
+					&[disabled]{
+						color: #C8C7CC;
+					}
+				}
+			}
+			.button{
+				margin-top: 20rpx * 4;
+				background: #d82d36;
+				color: white;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 10rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				border: none;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/auth/register.vue b/pages/auth/register.vue
new file mode 100644
index 0000000..4f86bc3
--- /dev/null
+++ b/pages/auth/register.vue
@@ -0,0 +1,286 @@
+<template>
+    <view>
+        <image class="loginBack" src="/static/img/login_back.png" mode="aspectFill"></image>
+        <view class="login">
+            <view class="header">
+                <view class="header-btn" @click="loginBack">
+                    <uni-icons type="closeempty" size="28" color="#666"></uni-icons>
+                </view>
+            </view>
+            <view class="title">
+                <image class="title-logo" src="../../static/img/logo.png" mode="aspectFill"></image>
+                <view class="title-name">欢迎使用，本时生活</view>
+            </view>
+            <view class="form">
+                <view class="inputs">
+                    <input type="number" v-model="mobile" @input="getNameValue" placeholder="输入手机号码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" v-model="password" @input="passwordValue" password placeholder="输入登录密码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" v-model="confirmation" @input="confirValue" password placeholder="确认登录密码" />
+                </view>
+                <view class="inputs">
+                    <input type="number" @input="getCodeValue" :value="code" placeholder="输入手机验证码" />
+                    <button type="default" @click="getCode" :disabled="disabled">
+                        {{ codename }}
+                    </button>
+                </view>
+                <button
+                    type="default"
+                    class="button"
+                    :disabled="mobile.length <= 0 || password.length <= 0 || confirmation.length <= 0 || code.length <= 0"
+                    @click="forgetlogin"
+                >立即注册</button>
+                <view class="login-wechat">
+                    <navigator hover-class="none" url="/pages/auth/login" class="login-wechat-btn">
+                        短信快捷登录
+                    </navigator>
+                    <navigator hover-class="none" url="/pages/auth/password_login" class="login-wechat-btn login-register">
+                        密码登录
+                    </navigator>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	import { register, send } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+                parentId    : '', // 推荐人id
+				codename    : '获取验证码',
+                password    : '', // 登录密码
+                confirmation: '', // 确认登录密码
+                mobile      : '', // 手机号
+                code        : '', // 验证码
+                disabled    : false // 按钮状态
+			};
+		},
+		onLoad(e){
+		},
+		onUnload() {},
+		methods:{
+            // mobileNo
+            getNameValue(e) {
+                this.mobile = e.detail.value
+            },
+            
+            // passwordNo
+            passwordValue(e) {
+                this.password = e.detail.value
+            },
+            
+            // confirmationNo
+            confirValue(e) {
+                this.confirmation = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobile,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({
+                        mobile : mobileNo,
+                        channel: 'LOGIN'
+                    }).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                            }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // forgetlogin
+            forgetlogin(){
+                uni.showLoading({
+                	title: '注册中...'
+                })
+                register({
+                    mobile: this.mobile,
+                    password: this.password,
+                    password_confirmation: this.confirmation,
+                    code: this.code,
+                    parent_id: ''
+                }).then(res=>{
+                    // 存储登录token
+                    this.$store.commit('setToken', res.token)
+                    uni.hideLoading()
+                    
+                    // 若没有登录密码则跳转设置登录密码页面
+                    if(res.has_password == false) {
+                        uni.redirectTo({
+                            url: '/pages/auth/password'
+                        })
+                        return
+                    }
+                    
+                    // 设置过登录密码,则跳到首页
+                    uni.switchTab({
+                        url: '/pages/index/index'
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : 'none'
+                    })
+                })
+            }
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: white;
+	}
+</style>
+<style lang="scss" scoped>
+    .loginBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+    }
+    
+	.login{
+        width: 100%;
+        z-index: 2;
+		padding: var(--status-bar-height) 20rpx * 4 0;
+        box-sizing: border-box;
+        position: relative;
+        top: 0;
+        left: 0;
+		.header{
+			padding: (20rpx * 2) 0 (20rpx * 5);
+			.header-btn{
+				display: none;
+				height: 90rpx;
+				width: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				margin-left: -30rpx;
+			}
+		}
+		.title {
+			margin-bottom: 20rpx * 5;
+			font-size: 30rpx;
+			font-weight: bold;
+            text-align: center;
+			color: #000;
+            .title-logo {
+                width: 160rpx;
+                height: 160rpx;
+                margin-bottom: 20rpx;
+            }
+		}
+		// 表单
+		.form{
+			.inputs{
+				margin-bottom: 20rpx * 2;
+                box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .2);
+                border-radius: 80rpx;
+                padding: 0 30rpx;
                box-sizing: border-box;
+				height: 90rpx;
+				line-height: 90rpx;
+				display: flex;
+				input {
+					flex: 1;
+					height: 90rpx;
+					font-size: 30rpx;
+				}
+				button{
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					background: white;
+					color: #188600;
+					margin-left: 20rpx;
+                    background: transparent;
+					padding: 0;
+					&:after{
+						border: none;
+					}
+					&[disabled]{
+						color: #C8C7CC;
+					}
+				}
+			}
+			.button{
+				margin-top: 20rpx * 4;
+				background: #000000;
+				color: white;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 80rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				border: none;
+                box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .7);
+				&[disabled]{
+					background: #c1c1c1;
+					box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: .1);
+				}
+			}
+		}
+		// 微信快捷登录
+		.login-wechat{
+            position: fixed;
+            width: 100%;
+            left: 0;
+            bottom: 0;
+            height: 140rpx;
+            display: flex;
+            padding: 0 100rpx;
+            box-sizing: border-box;
+			.login-wechat-btn {
+                width: 50%;
+				display: inline-block;
+			}
+            .login-register {
+                text-align: right;
+            }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/campus/buy.vue b/pages/campus/buy.vue
new file mode 100644
index 0000000..4b45622
--- /dev/null
+++ b/pages/campus/buy.vue
@@ -0,0 +1,680 @@
+<template>
+    <view>
+        <!-- 按钮 -->
+        <view class="newrightsBtn" @tap="payment">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ rightData.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ rightData.total }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 卡券 -->
+        <view style="padding-bottom: 90px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png" mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+                                <image :src="item" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                        <view class="nowrap rightsCont-btn">
+                            {{ rightData.detail.four_title }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.goods_cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.five_title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{ rightData.detail.price }}</view>
+                        <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" @click="goodsNumber('plus')">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 收货地址 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                    <block v-if="rightData.detail.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="/static/img/new_rightsAddress.png"></image>
+                            <block v-if="rightData.addressSee != ''">
+                                <view class="rightsLabel-right" @tap="addressTap">
+                                    <view class="rightsLabel-address-text">
+                                        <view class="rightsLabel-address-name">{{ rightData.addressSee.name }}<view class="rightsLabel-address-tel">{{ rightData.addressSee.mobile }}</view></view>
+                                        <text class="nowrap">{{ rightData.addressSee.all_address }}</text>
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                    <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                        添加收货地址
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </navigator>
+                            </block>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right rightsLabel-freight">￥{{ rightData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <view class="noticeText-top">购买须知</view>
+                    <view class="noticeText-cont" v-if="notice.remark">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+                    
+                    <view class="noticeText-top">内容介绍</view>
+                    <view class="noticeText-cont" v-if="notice.content">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { buy, buySubmit } from '@/apis/interfaces/campus'
+    
+    export default {
+        data() {
+            return {
+                rightData: {
+                    detail      : '',  // 权益内容
+                    rightId     : '',  // 权益id
+                    addressSee  : '',  // 收货地址
+                    num         : 1,   // 购买数量
+                    moreAmount  : '',  // 产品总金额
+                    freight     : '',  // 运费
+                    total       : ''   // 总金额
+                },
+                notice          : {
+                    remark      : '',     // 购买须知
+                    content     : '',     // 内容介绍
+                    noticeShow  : true   // 购买须知状态
+                },
+                buyWay          : {
+                    platformCp  : [],  // 选择提交数组
+                    platIndex   : 0,   // 选择提交方式下标
+                    isdeliver   : -1   // 选择提交方式
+                },
+                address         : {
+                    allAddress  : [],      // 收货地址列表
+                    addressShow : false    // 地址显示状态
+                },
+                disabled        : false,   //购买按钮状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.rightData.rightId = options.id
+            // this.code    = options.code || ''
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-校园迎新活动
+            getApp().globalData.envType = 'campusEnv'
+            
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                buy({activity_school_id: this.rightData.rightId, qty: this.rightData.num}).then(res => {
+                    console.log(res)
+                    let obj    = res.detail.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.def_get
+                        }
+                        if(res.detail.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.rightData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.rightData.num = num
+                    
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收银台跳转
+            payment() {
+                if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.rightData.detail.def_get
+                    
+                buySubmit({activity_school_id: this.rightData.rightId, qty: this.rightData.num, is_deliver: this.buyWay.isdeliver}).then(res => {
+                    uni.navigateTo({
+                        url: '/pages/cashier/index?tradeNo=' + res.trade_no + '&type=school' + "&activity_type=right" + '&price=' + this.rightData.moreAmount
+                    })
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+            
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #FFFFFF;
+    }
+    
+    /* 权益内容 */
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 340rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            .classBack {
+                position: absolute;
+                left: 28%;
+                right: 30%;
+                width: 44%;
+                top: 40rpx;
+            }
+        }
+        .classCircle::after,
+        .contBack::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+        }
+        .classCircle::after {
+            left: 20%;
+            top: -20rpx;
+            width: 260rpx;
+            height: 260rpx;
+        }
+        .contBack::before {
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .welfareCont-top{
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                height: 120rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 地址
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 40rpx;
+        color: #6c6c6c;
+        font-weight: 600;
+        font-size: 30rpx;
+    }
+    
+    .rightsLabel-left {
+        flex: 1;
+        color: #747d86;
+        .rightsLabel-row {
+            width: 42rpx;
+            height: 42rpx;
+        }
+    }
+    
+    .rightsLabel-range {
+        display: flex;
+        color: #000;
+        font-weight: 600;
+    }
+    
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 30rpx;
+            width: calc(100% - 60rpx);
+            height: 2rpx;
+            background-color: #bfbfbf;
+        }
+        &::after {
+            top: 0;
+        }
+        &::before {
+            bottom: 0;
+        }
+        .rightsLabel-row {
+            margin-top: 30rpx;
+        }
+        
+        .rightsLabel-icon {
+            width: 70rpx;
+            height: 70rpx;
+            margin-top: 14rpx;
+        }
+        .rightsLabel-right {
+            width: calc(100% - 80rpx);
+            margin-left: 10rpx;
+            display: flex;
+            font-size: 28rpx;
+            .rightsLabel-address-text {
+                flex: 1;
+                color: #000000;
+                .rightsLabel-address-name {
+                    display: flex;
+                    font-size: 32rpx;
+                    margin-bottom: 10rpx;
+                    .rightsLabel-address-tel {
+                        padding-left: 30rpx;
+                        color: #959595;
+                    }
+                }
+            }
+        }
+    }
+    .rightsLabel-row {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 0 0 0 6rpx;
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        border-top: 20rpx #eeeeee solid;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/campus/details.vue b/pages/campus/details.vue
new file mode 100644
index 0000000..b92410d
--- /dev/null
+++ b/pages/campus/details.vue
@@ -0,0 +1,539 @@
+<template>
+    <view>
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ details.startTime }} - {{ details.endTime }}
+        		</view>
+        	</view>
+        	<view class="detailsCotent">
+        	    <view class="source">活动来源 ： {{ details.activity_name }}</view>
+        	    <view class="detailsBar">
+        	    	<view class="detailsCode-text">劵码</view>
+        	    	<image :src="barcode" mode="widthFix"></image>
+        	    </view>
+        	    <view class="detailsCode-text">
+        	    	{{ details.code }}
+        	    </view>
+        	    <view class="detailsCode">
+        	    	<image :src="qrcode"></image>
+        	    	<view class="detailsCode-text">
+        	    		<text>请出示以上券码给网点工作人员</text>
+        	    	</view>
+        	    </view>
+                
+                <!-- 门店定位 -->
+                <view class="detailsStore">
+                	<view class="detailsStore-top">
+                		<view class="detailsStore-title">
+                			适用门店
+                		</view>
+                		<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + details.id + '&type=campus'" v-if="longitude != 0 && latitude != 0">
+                			查看所有
+                			<image src="/static/icon/arrow_left.png"></image>
+                		</navigator>
+                	</view>
+                	<view class="location" v-if="longitude == 0 && latitude == 0">
+                		<image class="location-img" src="/static/img/location_img.jpg"></image>
+                		<text>您尚未授权本时生活开启定位服务</text>
+                		<text>不能看到附近的商家哦，点击下方按钮开启</text>
+                		<button class="location-btn" size="mini" open-type="openSetting">
+                			开启定位服务
+                		</button>
+                	</view>
+                	<view v-else>
+                		<block v-if="stores.length > 0">
+                			<view class="detailsStore-list" :data-id="(item.store_id)" v-for="(item, index) in stores" :key="index"
+                				@tap="detailsTap">
+                				<image :src="item.cover" class="detailsStore-logo"></image>
+                				<view class="detailsStore-cont">
+                					<view class="detailsStore-left">
+                						<view class="nowrap detailsStore-name">
+                							{{ item.title }}
+                						</view>
+                						<view class="detailsStore-place">
+                							<text class="nowrap">{{ item.address }}</text>
+                							{{ item.km }}
+                						</view>
+                					</view>
+                					<image class="detailsStore-tel" src="/static/icon/tel.png" @tap.stop="tel"
+                						:data-tel="(item.mobile)"></image>
+                				</view>
+                			</view>
+                		</block>
+                		<block v-else>
+                			<view class="pages-hint">
+                				<image src="/static/img/null_icon.png"></image>
+                				<view>暂无门店</view>
+                			</view>
+                		</block>
+                	</view>
+                </view>
+        	</view>
+            <!-- 使用须知 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		使用须知
+            	</view>
+            	<view class="detailsText-tips">
+            		<rich-text :nodes="remark"></rich-text>
+            	</view>
+            </view>
+            
+            <!-- 内容介绍 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		内容介绍
+            	</view>
+            	<view class="detailsText-tips" v-if="content != null">
+            		<rich-text :nodes="content"></rich-text>
+            	</view>
+            </view>
+        </view>
+        
+        <!-- 底部 -->
+        <view class="detailsBottom">
+            <image src="/static/img/campus_details_back.png" mode="aspectFill"></image>
+            <view class="detailsBottom-cont">
+                <view class="detailsBottom-title">
+                    校园迎新活动
+                </view>
+                亿时代 - 本时生活
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { qrcode, barcode, couponinfo, merchantCard } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                id          : 0,        //优惠券id
+                longitude   : 0,        //经度
+                latitude    : 0,        //纬度
+                details     : '',       //优惠券信息
+                stores      : [],       //商家列表
+                content     : '',       //内容介绍
+                remark      : '',       //使用须知
+                qrcode      : '',       //二维码
+                barcode     : '',       //条形码
+                merchantcardinfo:''     //商家券信息
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 优惠券id
+            this.id = options.id
+    
+            // 获取二维码
+            qrcode(options.id).then(res=>{
+                this.qrcode = res.qrcode
+            })
+            
+            // 获取条形码
+            barcode(options.id).then(res=>{
+                this.barcode = res.barcode
+            })
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-校园迎新活动
+            getApp().globalData.envType = 'campusEnv'
+            
+            // 获取定位信息
+            uni.getLocation({
+                success: res => {
+                    this.latitude   = res.latitude
+                    this.longitude  = res.longitude
+                },
+                complete: () => {
+                    // 获取详情信息
+                    this.detailsInfo();
+                }
+            })
+        },
+        methods: {
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.id,
+                    user_lng: this.longitude,
+                    user_lat: this.latitude
+                }).then(res=>{
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.details = res.info
+                    this.stores  = stores
+                    this.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    //获取商家券信息
+                    if(res.info.card_type=='merchant_card'){
+                        this.getMerchantCardInfo()
+                    }
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商家券信息
+            getMerchantCardInfo(){
+                merchantCard(this.id).then(res=>{
+                   this.merchantcardinfo  = res
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 拨打电话
+            tel(e) {
+                let tel = e.currentTarget.dataset.tel
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                    url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat + '&type=campus'
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 卡券详情 */
+    .details {
+        background: #ffffff;
+        margin: 20rpx 20rpx 0;
+        width: calc(100% - 40rpx);
+        box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+        position: relative;
+        border-radius: 0 0 20rpx 20rpx;
+        border-bottom: 240rpx solid transparent;
+    }
+    
+    .details::after,
+    .details::before {
+        position: absolute;
+        background: #e83241;
+        content: '';
+        top: -50rpx;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    
+    .details::after {
+        left: -50rpx;
+    }
+    
+    .details::before {
+        right: -50rpx;
+    }
+    
+    .detailsCotent {
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop {
+        border-bottom: 2rpx dashed #c8c8c8;
+        padding: 40rpx 0;
+        text-align: center;
+        background-color: #f5f5f5;
+    }
+    
+    .detailsTop-name {
+        font-size: 38rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        padding: 0 60rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop-time {
+        color: #7e7e7e;
+        font-size: 26rpx;
+    }
+    
+    .detailsCode {
+        text-align: center;
+        padding: 0 0 20rpx;
+        margin: 40rpx 0 30rpx;
+    }
+    
+    .detailsCode image {
+        width: 300rpx;
+        height: 300rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    
+    .detailsCode-text {
+        text-align: center;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #000;
+    }
+    
+    .detailsCode-text text {
+        color: #999;
+        font-weight: normal;
+        font-size: 26rpx;
+    }
+    
+    .detailsStore {
+        border-top: 2rpx #c8c8c8 solid;
+        padding-top: 40rpx;
+    }
+    
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 130rpx;
+        top: 0;
+        width: calc(100% - 130rpx);
+        display: flex;
+    }
+    
+    .detailsStore-left {
+        width: calc(100% - 90rpx);
+        margin-right: 30rpx;
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+        border-top: 2rpx solid #ececec;
+    }
+    
+    .detailsText-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText-tips {
+        font-size: 26rpx;
+        line-height: 50rpx;
+        color: #555557;
+        padding-bottom: 20rpx;
+    }
+    
+    .detailsCode-join {
+        color: #ee8e44;
+        font-size: 24rpx;
+        border-radius: 50rpx;
+        border: 2rpx solid #ee8e44;
+        padding: 10rpx 20rpx;
+        display: inline-block;
+        margin-top: 30rpx;
+    }
+    
+    .detailsCode-join.active {
+        border: 2rpx solid #999;
+        color: #999;
+    }
+    
+    .source{ 
+        margin: 30rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .location {
+        background: white;
+        width: 100%;
+        text-align: center;
+        margin: 60rpx 0 0;
+    }
+    
+    .location text {
+        font-size: 28rpx;
+        display: block;
+        line-height: 46rpx;
+        color: #999;
+    }
+    
+    .location-btn[size="mini"] {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 66rpx;
+        margin-top: 30rpx;
+    }
+    
+    .location-img {
+        width: 150rpx;
+        height: 120rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsBar {
+        text-align: center;
+        padding: 0 50rpx;
+        box-sizing: border-box;
+        margin-top: 60rpx;
+        margin-bottom: 40rpx;
+    }
+    
+    
+    .detailsBar image {
+        width: 100%;
+    }
+    
+    .detailsBar .detailsCode-text {
+        margin-bottom: 10px;
+        color: #000;
+    }
+    
+    .detailsBottom {
+        position: fixed;
+        width: 100%;
+        height: 220rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 9;
+    }
+    .detailsBottom image {
+         width: 100%;
+         height: 100%;
+         position: absolute;
+         left: 0;
+         top: 0;
+    }
+    
+    .detailsBottom-cont {
+        z-index: 10;
+        position: absolute;
+        left: 0;
+        top: 70rpx;
+        width: 100%;
+        text-align: center;
+        color: #9a9a9a;
+        font-size: 26rpx;
+    }
+    
+    .detailsBottom-title {
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        font-size: 30rpx;
+    }
+</style>
diff --git a/pages/campus/index.vue b/pages/campus/index.vue
new file mode 100644
index 0000000..21956f9
--- /dev/null
+++ b/pages/campus/index.vue
@@ -0,0 +1,323 @@
+<template>
+    <view>
+        <image class="campusBanner" src="/static/img/campusIdx_back.png" mode="widthFix"></image>
+        <view class="recommend">
+            <navigator hover-class="none" :url="'/pages/campus/buy?id=' + item.activity_school_id" class="recommend-label" v-for="(item, index) in topData" :key="index">
+                <view class="recommend-label-img">
+                    <image :src="item.cover" mode="aspectFill"></image>
+                </view>
+                <view class="nowrap recommend-label-text">
+                    {{ item.title }}<text>{{ item.name }}</text>
+                </view>
+            </navigator>
+        </view>
+        
+        <!-- 电影券 -->
+        <view class="film">
+            <view class="filmTitle">
+                电影院优惠券
+            </view>
+            <navigator hover-class="none" :url="'/pages/campus/buy?id=' + item.activity_school_id" class="filmList" v-for="(item, index) in filmData" :key="index">
+                <view class="filmList-top">
+                    <view class="filmList-top-name">
+                        {{ item.three_title || '-' }}<text>{{ item.two_title || '-'}}</text>
+                    </view>
+                    <view class="filmList-top-price">
+						<view class="filmList-tag" v-if="item.label != null">{{item.label || '-'}}</view>
+						<view v-if="item.button_text != null">
+							<view v-for="(btnItem, btnIndex) in item.button_text" :key="btnIndex">{{btnItem}}</view>
+						</view>
+                    </view>
+                </view>
+                <view class="filmList-text" v-for="(items, index) in item.description" :key="index">
+                    <text>{{ items }}</text>
+                </view>
+            </navigator>
+        </view>
+        
+        <!-- 洗浴优惠券 -->
+        <view class="film">
+            <view class="filmTitle">
+                洗浴优惠券
+            </view>
+            <navigator hover-class="none" :url="'/pages/campus/buy?id=' + item.activity_school_id" class="filmList" v-for="(item, index) in bathData" :key="index">
+                <view class="filmList-top">
+                    <view class="filmList-top-name">
+                        {{ item.three_title || '-' }}<text>{{ item.two_title || '-'}}</text>
+                    </view>
+                    <view class="filmList-top-price">
+						<view class="filmList-tag" v-if="item.label != null">{{item.label || '-'}}</view>
+                        <view v-if="item.button_text != null">
+                        	<view v-for="(btnItem, btnIndex) in item.button_text" :key="btnIndex">{{btnItem}}</view>
+                        </view>
                    </view>
+                </view>
+                <view class="filmList-text" v-for="(items, index) in item.description" :key="index">
+                    <text>{{ items }}</text>
+                </view>
+            </navigator>
+        </view>
+        
+        <!-- 超市券 -->
+        <view class="film">
+            <view class="filmTitle">
+                超市券
+            </view>
+            <navigator hover-class="none" :url="'/pages/campus/buy?id=' + item.activity_school_id" class="filmList" v-for="(item, index) in marketData" :key="index">
+                <view class="filmList-top">
+                    <view class="filmList-top-name">
+                        {{ item.three_title || '-' }}<text>{{ item.two_title || '-'}}</text>
+                    </view>
+                    <view class="filmList-top-price">
+						<view class="filmList-tag" v-if="item.label != null">{{item.label || '-'}}</view>
+						<view v-if="item.button_text != null">
+							<view v-for="(btnItem, btnIndex) in item.button_text" :key="btnIndex">{{btnItem}}</view>
+						</view>
+                    </view>
+                </view>
+                <view class="filmList-text" v-for="(items, index) in item.description" :key="index">
+                    <text>{{ items }}</text>
+                </view>
+            </navigator>
+        </view>
+        
+        <!-- 餐饮优惠券 -->
+        <view class="film">
+            <view class="filmTitle">
+                餐饮优惠券
+            </view>
+            <navigator hover-class="none" :url="'/pages/campus/buy?id=' + item.activity_school_id" class="filmList" v-for="(item, index) in repastData" :key="index">
+                <view class="filmList-top">
+                    <view class="filmList-top-name">
+                        {{ item.three_title || '-' }}<text>{{ item.two_title || '-'}}</text>
+                    </view>
+                    <view class="filmList-top-price">
+						<view class="filmList-tag" v-if="item.label != null">{{item.label || '-'}}</view>
+                        <view v-if="item.button_text != null">
+                        	<view v-for="(btnItem, btnIndex) in item.button_text" :key="btnIndex">{{btnItem}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="filmList-text" v-for="(items, index) in item.description" :key="index">
+                    <text>{{ items }}</text>
+                </view>
+            </navigator>
+        </view>
+        <!-- 按钮 -->
+        <view @click="userNav('/pages/campus/myCoupon')" class="campusBtn">我的优惠券<text>立即查看</text></view>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                topData     : [],  // 头部推荐
+                filmData    : [],  // 电影活动列表
+                marketData  : [],  // 超市活动列表
+                bathData    : [],  // 洗浴活动列表
+                repastData  : [],  // 餐饮活动列表
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-校园迎新活动
+            getApp().globalData.envType = 'campusEnv'
+            
+            // 获取首页数据
+            this.indexInfo();
+        },
+        methods: {
+            // 首页数据
+            indexInfo() {
+                index().then(res=>{
+                    this.topData = res.top
+                    this.filmData = res.film
+                    this.marketData = res.market
+                    this.bathData = res.bath
+                    this.repastData = res.repast
+                }).catch(err=>{
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/campus/signin'
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        padding-bottom: 100rpx;
+    }
+    
+    // banner
+    .campusBanner {
+        width: 100%;
+    }
+    
+    // 推荐
+    .recommend {
+        overflow: hidden;
+        margin-top: -60rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        .recommend-label {
+            text-align: center;
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx 30rpx;
+            .recommend-label-img {
+                width: 150rpx;
+                height: 150rpx;
+                margin: 0 auto 10rpx;
+                background: linear-gradient(to bottom, #293350, #484e74);
+                box-shadow: 0px 8px 6px rgba(249,228,129,.5);
+                border-radius: 50%;
+                box-sizing: border-box;
+                image {
+                    width: 80rpx;
                    height: 80rpx;
+                    margin: 35rpx;
+                }
+            }
+            .recommend-label-text {
+                font-weight: 600;
+                text {
+                    display: block;
+                    font-size: 30rpx;
+                }
+            }
+        }
+    }
+    
+    // 列表
+    .film {
+        width: 100%;
+        padding: 10rpx 30rpx;
+        box-sizing: border-box;
+    }
+    .filmTitle {
+        background: linear-gradient(to right, #feefce, #fbe9c0, #e8d19b);
+        line-height: 80rpx;
+        box-shadow: -4px 0 10px rgba(134,97,33,.2);
+        text-align: center;
+        border-radius: 10rpx 10rpx 0 0;
+        color: #a47d53;
+        font-weight: 600;
+        margin: 0 20rpx;
+    }
+    .filmList {
+        background: linear-gradient(to right, #494e75, #27314d);
+        box-shadow: 0px 6px 10px rgba(134,97,33,.5);
+        border-radius: 10rpx;
+        padding: 50rpx 30rpx 30rpx;
+        box-sizing: border-box;
+        margin-bottom: 20rpx;
+        &:last-child {
+            margin-bottom: 0;
+        }
+        .filmList-top {
+            display: flex;
+            margin-bottom: 10rpx;
+            .filmList-top-name {
+                width: calc(100% - 160rpx);
+                margin-right: 20rpx;
+                color: #fce2ae;
+                font-size: 34rpx;
+				font-weight: bold;
+                text {
+                    display: block;
+                    font-size: 25rpx;
+                    margin-top: 10rpx;
+					font-weight: normal;
+                }
+            }
+            .filmList-top-price {
+				position: relative;
+                background: linear-gradient(to right, #d3ad68, #cda65f);
+                box-shadow: 0px 2px 10px rgba(249,228,129,.5);
+                width: 120rpx;
+                height: 120rpx;
+                border-radius: 50%;
+                color: #FFFFFF;
+                text-align: center;
+                padding-top: 20rpx;
+                font-size: 30rpx;
+                box-sizing: border-box;
+                text {
+                    display: block;
+                    text-shadow: 0px 6px 10px rgba(134,97,33,.5);
+                }
+				.filmList-tag{
+					position: absolute;
+					background: #ff0000;
+					color: white;
+					font-size: 20rpx;
+					top: -10%;
+					left: 20%;
+					width: 120rpx;
+					padding: 0 10rpx;
+					line-height: 40rpx;
+					border-radius: 15rpx;
+					transform: scale(0.58)
+				}
+            }
+        }
+        .filmList-text {
+            font-size: 20rpx;
+            color: #c1c1c1;
+			// margin-left: -70rpx;
+            text {
+                display: block;
+				// transform: scale(0.8)
+            }
+        }
+    }
+    
+    // 按钮
+    .campusBtn {
+        background: linear-gradient(to right, #474d73, #28314e);
+        box-shadow: 0px 6px 10px rgba(188,152,90,.5);
+        border-radius: 60rpx;
+        line-height: 90rpx;
+        height: 90rpx;
+        margin: 30rpx 60rpx 0;
+        text-align: center;
+        color: #FFFFFF;
+        text {
+            color: #bd9045;
+            padding-left: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/campus/myCoupon.vue b/pages/campus/myCoupon.vue
new file mode 100644
index 0000000..206715c
--- /dev/null
+++ b/pages/campus/myCoupon.vue
@@ -0,0 +1,653 @@
+<template>
+    <view>
+        <image class="campusCoupon" src="/static/img/campusCoupon_img.png" mode="widthFix"></image>
+        <view class="user">
+           <image src="/static/img/campusCoupon_user.png" mode=""></image> 尊敬的<text>{{ userTel }}</text>, 欢迎参加校园迎新活动
+        </view>
+        <!-- 我的卡券 -->
+        <view class="borderContent">
+            <view class="campusCont">
+                <!-- 卡券tab -->
+                <view class="couponTab">
+                    <view class="couponTab-label" :class="{active : stateType == item.used}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-index="(index)" :data-state="(item.used)">
+                        {{ item.title }}
+                        <view v-if="item.used == 0">({{count.init}}张)</view>
+                        <view v-else-if="item.used == 1">({{count.used}}张)</view>
+                        <view v-else>({{ count.pass }}张)</view>
+                    </view>
+                </view>
+                
+                <!-- 卡券列表 -->
+                <view class="coupon" v-if="coupons.length > 0" :class="{active : coupons.length < 1}">
+                    <view class="couponCont" :class="{active : item.status != 0}" v-for="(item, index) in coupons" :key="index">
+                        <view hover-class="none" class="couponList" @tap="couponUrl" :data-id="(item.coupon_id)">
+                            <view class="couponList-left">
+                                <image class="couponList-img" src="/static/img/coupon_coupon_img.png"></image>
+                                <!-- 优惠券 -->
+                                <view class="couponList-icon" v-if="item.type == 'physical'">
+                                    <image src="/static/img/coupon_icon_01.png"></image>
+                                </view>
+                
+                                <!-- 实物 -->
+                                <view class="couponList-icon" v-else>
+                                    <image src="/static/img/coupon_icon_00.png"></image>
+                                </view>
+                            </view>
+                            <view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+                                <view class="nowrap couponList-title">{{ item.name }}</view>
+                                <view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{item.activity_name}}</view>
+                                <view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+                                <view class="couponList-used" v-if="item.used_at != ''">使用时间：{{item.used_at}}</view>
+                            </view>
+                            <block v-if="item.status == 0">
+                                <view class="couponList-right">
+                                    去使用
+                                </view>
+                            </block>
+                            <image v-if="item.status == 1" src="/static/img/coupon_tips_00.png" class="coupoTips"></image>
+                            <image v-if="item.status == 2" src="/static/img/coupon_tips_01.png" class="coupoTips"></image>
+                        </view>
+                        <view class="couponMore" v-if="item.count > 1" >
+                            <view class="couponMore-text" @tap="couponTap" :data-id="(item.activityId)" :data-status="(item.status)">
+                                <view class="couponMore-title">查看全部{{ item.count }}张卡券</view>
+                                <image class="couponMore-arrow" src="/static/icon/arrow_left.png"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                
+                <!-- 优惠券为空 -->
+                <view class="campus_tips" v-else>
+                    <image src="/static/img/coupon_tips.png"></image>
+                    <view>暂无优惠券</view>
+                </view>
+            </view>
+        </view>
+        <!-- 底部快捷导航 -->
+        <view class="navFooter">
+            <navigator hover-class="none" url="/pages/campus/index" class="navFooter-label">
+                <image src="/static/icon/navFooter_icon_00.png" mode=""></image>
+                活动中心
+            </navigator>
+            <view class="navFooter-label active">
+                <image src="/static/icon/navFooter_icon_01_active.png" mode=""></image>
+                我的优惠券
+            </view>
+        </view>
+        
+        <!-- 漂浮窗 -->
+        <view class="indexFloat" @click="followBtn">
+        	<image src="/static/img/subscribe.png" mode="aspectFill" class="indexFloat-animation"></image>
+            <view class="indexFloat-text">
+                <!-- <text>可查看大图</text> -->
+                <text>关注公众号</text>
+            </view>
+        </view>
+        
+        <!-- 关注公众号弹出 -->
+        <view class="followBack" :class="{active : followState}"></view>
+        <view class="followPop" :class="{active : followState}">
+            <image class="followPop-img" src="/static/img/subscribe.png" mode="widthFix"></image>
+            <view class="followPop-text">
+                <text>长按识别图中二维码</text>
+                <image src="/static/img/follow_tips.png" mode="aspectFill"></image>
+            </view>
+            <view class="followPop-tips">
+                本时生活平台优惠活动
+            </view>
+        </view>
+        <image class="followPop-clos" :class="{active : followState}" src="/static/icon/add.png" mode="aspectFill" @click="followBtn"></image>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/user'
+    import { coupon } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                userTel     : '',   //用户者手机号
+                coupons     : [],   //优惠券列表
+                count       : '',   //优惠券-张数
+                //优惠券Tab列表
+                couponLabel : [
+                    { title : "未使用", used: 0 },
+                    { title : "已使用", used: 1 },
+                    { title : "已过期", used: 2 }
+                ],
+                stateType   : '0', //卡券状态
+                type        : '',  //卡券来源
+                followState : false //二维码弹出状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 获取用户信息
+            index().then(res => {
+                this.userTel = res.info.username
+            }).catch(err => {
+                if (!err.login) {
+                    uni.showModal({
+                        title: '用户登录已过期',
+                        content: '请重新登录',
+                        showCancel: false,
+                        success: res => {
+                            if (res.confirm) {
+                                uni.redirectTo({
+                                    url: '/pages/campus/signin'
+                                });
+                            }
+                        }
+                    });
+                }
+            });
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-校园迎新活动
+            getApp().globalData.envType = 'campusEnv'
+            
+            // 获取列表
+            this.couponInfo();
+        },
+        methods: {
+            // 卡券列表
+            couponInfo() {
+                coupon({
+                    status: this.stateType,
+                    type: 'school'
+                }).then(res=>{
+                    this.count   = res.count
+                    this.coupons = res.list
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    wx.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // tabs 选项卡
+            orderTab(e){
+                if(this.stateType != e.currentTarget.dataset.state){
+                    this.stateType = e.currentTarget.dataset.state
+                    // 获取卡权益
+                    this.couponInfo()
+                }
+            },
+            
+            // 查看优惠券分组
+            couponTap(e) {
+                let id      = e.currentTarget.dataset.id,
+                    status  = e.currentTarget.dataset.status
+                uni.navigateTo({
+                    url: '/pages/campus/myList?id=' + id + '&status=' + status
+                })
+            },
+            
+            // 优惠券跳转详情
+            couponUrl(e) {
+                let newId     = e.currentTarget.dataset.id
+                uni.navigateTo({
+                    url: '/pages/campus/details?id=' + newId
+                })
+            },
+            
+            // 公众号展示
+            followBtn() {
+                this.followState = !this.followState
+            }
+        }
+    }
+</script>
+
+<style>
+    .campusCoupon {
+        width: 100vw;
+    }
+    
+    page {
+        background-color: #c32631;
+    }
+    
+    /* 用户信息 */
+    .user {
+        width: 100%;
+        background: linear-gradient(to right, #f9ecb7, #eed276);
+        font-size: 28rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        color: #da2025;
+        display: flex;
+        line-height: 48rpx;
+    }
+    
+    .user text {
+        font-weight: 600;
+        padding: 0 10rpx;
+    }
+    
+    .user image {
+        width: 48rpx;
+        height: 48rpx;
+        margin-right: 10rpx;
+    }
+    
+    /* 优惠券 */
+    .borderContent {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .campusCont {
+        background-color: #e83241;
+        margin: 30rpx 20rpx;
+        border-radius: 20rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .campusCont.active {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .couponTab{
+        background-color: #d32838;
+        color: #ffffff;
+        display: flex;
+        padding: 20rpx 40rpx 0;
+        box-sizing: border-box;
+        border-radius: 20rpx 20rpx 0 0;
+    }
+    
+    .couponTab-label {
+        flex: 3;
+        text-align: center;
+        position: relative;
+        padding: 10rpx 20rpx;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        border-radius: 20rpx 20rpx 0 0;
+    }
+    
+    .couponTab-label.active {
+        background-color: #fdf4ed;
+        color: #b9505f;
+    }
+    
+    .couponTab-label view {
+        font-size: 24rpx;
+        margin-top: 6rpx;
+    }
+    
+    .coupon {
+        padding-bottom: 10rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponCont {
+        margin: 0 0 30rpx;
+        width: 100%;
+        border-radius: 10rpx;
+        overflow: hidden;
+    }
+    
+    .couponCont:last-child {
+        margin-bottom: 0;
+    }
+    
+    .couponList {
+        background: #fdf4ed;
+        width: 100%;
+        height: 160rpx;
+        position: relative;
+    }
+    
+    .couponList-left {
+        position: relative;
+        left: 0;
+        top: 0;
+        width: 160rpx;
+        height: 160rpx;
+    }
+    
+    .couponList-img {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+    
+    .couponList-icon {
+        position: absolute;
+        left: calc(50% - 56rpx);
+        top: calc(50% - 50rpx);
+        z-index: 2;
+        width: 100rpx;
+        height: 100rpx;
+        background: #fff;
+        border-radius: 50%;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponList-icon image {
+        width: 100%;
+        height: 100%;
+    }
+    
+    .couponList-center {
+        position: absolute;
+        left: 180rpx;
+        top: 35rpx;
+        width: calc(100% - 330rpx);
+    }
+    
+    .couponList-center.active {
+        top: 15rpx;
+    }
+    
+    .couponList-title {
+        margin-bottom: 10rpx;
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #743e3e;
+    }
+    
+    .couponList-time,
+    .couponList-used {
+        font-size: 24rpx;
+        color: grey;
+    }
+    
+    .couponList-used {
+        margin-bottom: 14rpx;
+        color: #855757;
+    }
+    
+    .couponList-right {
+        background: transparent;
+        border: 2rpx solid #fc9f36;
+        color: #f39124;
+        border-radius: 30rpx;
+        width: 110rpx;
+        text-align: center;
+        height: 50rpx;
+        line-height: 50rpx;
+        position: absolute;
+        right: 20rpx;
+        top: 55rpx;
+        font-size: 24rpx;
+    }
+    
+    .couponList-right.active {
+        background: #dddddd;
+    }
+    
+    .couponMore {
+        font-size: 28rpx;
+        color: #686868;
+        position: relative;
+        height: 120rpx;
+    }
+    
+    .couponMore::after,
+    .couponMore::before {
+        position: absolute;
+        content: '';
+        height: 20rpx;
+        border-radius: 10rpx;
+        background: #fff;
+        box-shadow: 0 0 20rpx rgba(0, 0, 0, .1);
+        z-index: 1;
+        height: 30rpx;
+    }
+    
+    .couponMore::after {
+        width: calc(100% - 40rpx);
+        top: 70rpx;
+        left: 20rpx;
+    }
+    
+    .couponMore::before {
+        width: calc(100% - 80rpx);
+        top: 90rpx;
+        left: 40rpx;
+    }
+    
+    .couponMore-text {
+        display: flex;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 99;
+        height: 80rpx;
+        border-radius: 0 0 10rpx 10rpx;
+        line-height: 80rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        background: #fff;
+        box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    }
+    
+    .couponMore-title {
+        flex: 1;
+    }
+    
+    .couponMore-arrow {
+        width: 28rpx;
+        height: 28rpx;
+        margin-top: 26rpx;
+    }
+    
+    .couponCont.active .couponList-img,
+    .couponCont.active .couponList-icon {
+        -webkit-filter: grayscale(100%);
+        -moz-filter: grayscale(100%);
+        -ms-filter: grayscale(100%);
+        -o-filter: grayscale(100%);
+        filter: grayscale(100%);
+        filter: gray;
+    }
+    
+    .coupoTips {
+        position: absolute;
+        top: 22rpx;
+        right: 20rpx;
+        z-index: 99;
+        width: 120rpx;
+        height: 120rpx;
+    }
+    
+    .campus_tips {
+        text-align: center;
+        width: 100%;
+        background-color: #ffffff;
+        border-radius: 0 0 20rpx 20rpx;
+        padding: 80rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .campus_tips image {
+        width: 160rpx;
+        height: 160rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    /* 底部快捷导航 */
+    .navFooter {
+        position: fixed;
+        width: 100%;
+        height: 110rpx;
+        background-color: #FFFFFF;
+        z-index: 1000;
+        left: 0;
+        bottom: 0;
+        font-size: 26rpx;
+        display: flex;
+    }
+    
+    .navFooter-label {
+        flex: 2;
+        text-align: center;
+        width: 50%;
+        color: #a2a2a2;
+    }
+    
+    .navFooter-label.active {
+        color: #c32631;
+    }
+    
+    .navFooter-label image {
+        width: 54rpx;
+        height: 54rpx;
+        display: block;
+        margin: 8rpx auto 0;
+    }
+    
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        right: 20rpx;
+        bottom: 180rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-text {
+        height: 40rpx;
+        overflow: hidden;
+        color: #000000;
+    }
+    
+    .indexFloat-text text {
+        line-height: 40rpx;
+        display: block;
+        font-size: 24rpx;
+    }
+    
+    .indexFloat-animation {
+        width: 130rpx;
+        height: 130rpx;
+        animation: shake 3s linear infinite;
+    }
+    
+    @keyframes shake {
+        70%, 80% {
+          transform: rotate(7deg);
+        }
+        75% {
+          transform: rotate(-7deg);
+        }
+       
+        65%,
+        85% {
+          transform: rotate(0);
+        }
+    }
+    
+    /* 关注公众号弹出 */
+    .followBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        background: rgba(0,0,0,.7);
+        left: 0;
+        top: 0;
+        z-index: 1000;
+        display: none;
+    }
+    
+    .followBack.active {
+        display: block;
+    }
+    
+    .followPop {
+        position: fixed;
+        z-index: 1001;
+        height: 760rpx;
+        left: 15%;
+        right: 15%;
+        top: 300rpx;
+        background-color: #ffffff;
+        border-radius: 20rpx;
+        text-align: center;
+        overflow: hidden;
+        display: none;
+    }
+    
+    .followPop.active {
+        display: block;
+    }
+    
+    .followPop-img {
+        width: 70%;
+        margin: 60rpx 0 50rpx;
+    }
+    
+    .followPop-text {
+        color: #7d7d7d;
+        font-size: 32rpx;
+        position: relative;
+    }
+    
+    .followPop-text::after,
+    .followPop-text::before {
+        position: absolute;
+        content: '';
+        top: 25rpx;
+        width: 60rpx;
+        height: 2rpx;
+        background-color: #cfcfcf;
+    }
+    
+    .followPop-text::after {
+        left: 30rpx;
+    }
+    
+    .followPop-text::before {
+        right: 30rpx;
+    }
+    
+    .followPop-text image {
+        width: 120rpx;
+        height: 120rpx;
+        margin: 10rpx auto 20rpx;
+        display: block;
+    }
+    
+    .followPop-tips {
+        background-color: #e1e5ec;
+        line-height: 90rpx;
+        color: #7f8487;
+    }
+    
+    .followPop-clos {
+        position: fixed;
+        top: 1100rpx;
+        left: calc(50% - 25rpx);
+        width: 50rpx;
+        height: 50rpx;
+        z-index: 1001;
+        display: none;
+        transform: rotate(45deg);
+    }
+    
+    .followPop-clos.active {
+        display: block;
+    }
+</style>
diff --git a/pages/campus/myList.vue b/pages/campus/myList.vue
new file mode 100644
index 0000000..3daf397
--- /dev/null
+++ b/pages/campus/myList.vue
@@ -0,0 +1,315 @@
+<template>
+    <view>
+        <!-- 我的卡券列表 -->
+        <view class="coupon" v-if="couponArr.length > 0">
+        	<view class="couponCont" :class="{active : item.status != 0}" v-for="(item, index) in couponArr" :key="index">
+        		<view hover-class="none" class="couponList" @tap="couponUrl" :data-id="(item.id)">
+        			<view class="couponList-left">
+        				<image class="couponList-img" src="/static/img/coupon_coupon_img.png"></image>
+        				<!-- 优惠券 -->
+        				<view class="couponList-icon" v-if="item.type == 'physical'">
+        					<image src="/static/img/coupon_icon_01.png"></image>
+        				</view>
+        
+        				<!-- 实物 -->
+        				<view class="couponList-icon" v-else>
+        					<image src="/static/img/coupon_icon_00.png"></image>
+        				</view>
+        			</view>
+        			<view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+        				<view class="nowrap couponList-title">{{ item.name }}</view>
+                        <view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{item.activity_name}}</view>
+        				<view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+        				<view class="couponList-used" v-if="item.used_at != ''">使用时间：{{item.used_at}}</view>
+        			</view>
+        			<block v-if="item.status == 0">
+        				<view class="couponList-right">
+        					去使用
+        				</view>
+        			</block>
+        			<image v-if="item.status == 1" src="/static/img/coupon_tips_00.png" class="coupoTips"></image>
+        			<image v-if="item.status == 2" src="/static/img/coupon_tips_01.png" class="coupoTips"></image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+        	<image src="/static/img/coupon_tips.png"></image>
+        	<view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { couponArr } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                couponArr   : '',    //卡券组列表
+                id          : '',    //优惠券携带id
+                status      : '',    //优惠券携带状态
+                page        : 1,     //分页
+                lodingStats : false  //加载状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.id      = options.id
+            this.status  = options.status
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-校园迎新活动
+            getApp().globalData.envType = 'campusEnv'
+            
+            // 获取卡券组列表
+            this.couponInfo();
+        },
+        
+        methods: {
+            // 卡券列表
+            couponInfo(page) {
+                couponArr({
+                    activityId: this.id,
+                    status: this.status,
+                    page: page || ''
+                }).then(res=>{
+                    let listArr = this.couponArr,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+        
+                    newData = listArr.concat(res.data)
+                    this.couponArr   = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 优惠券跳转
+            couponUrl(e) {
+                let newId     = e.currentTarget.dataset.id
+                uni.navigateTo({
+                    url: '/pages/campus/details?id=' + newId
+                })
+            },
+            
+            // 页面相关事件处理函数--监听用户下拉动作
+            onPullDownRefresh() {
+                // 获取团购列表
+                this.couponInfo();
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.couponInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+    }
+    
+    .coupon {
+        margin-top: 30rpx;
+    }
+    
+    .couponCont {
+        margin: 20rpx;
+        width: calc(100% - 40rpx);
+        border-radius: 10rpx;
+        overflow: hidden;
+    }
+    
+    .couponList {
+        background: #fdf4ed;
+        width: 100%;
+        height: 160rpx;
+        position: relative;
+    }
+    
+    .couponList-left {
+        position: relative;
+        left: 0;
+        top: 0;
+        width: 160rpx;
+        height: 160rpx;
+    }
+    
+    .couponList-img {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+    
+    .couponList-icon {
+        position: absolute;
+        left: calc(50% - 56rpx);
+        top: calc(50% - 50rpx);
+        z-index: 2;
+        width: 100rpx;
+        height: 100rpx;
+        background: #fff;
+        border-radius: 50%;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponList-icon image {
+        width: 100%;
+        height: 100%;
+    }
+    
+    .couponList-center {
+        position: absolute;
+        left: 180rpx;
+        top: 35rpx;
+        width: calc(100% - 330rpx);
+    }
+    
+    .couponList-center.active {
+        top: 15rpx;
+    }
+    
+    .couponList-title {
+        margin-bottom: 10rpx;
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #743e3e;
+    }
+    
+    .couponList-time,
+    .couponList-used {
+        font-size: 24rpx;
+        color: grey;
+    }
+    
+    .couponList-used {
+        margin-bottom: 14rpx;
+        color: #855757;
+    }
+    
+    .couponList-right {
+        background: transparent;
+        border: 2rpx solid #fc9f36;
+        color: #f39124;
+        border-radius: 30rpx;
+        width: 110rpx;
+        text-align: center;
+        height: 50rpx;
+        line-height: 50rpx;
+        position: absolute;
+        right: 20rpx;
+        top: 55rpx;
+        font-size: 24rpx;
+    }
+    
+    .couponList-right.active {
+        background: #dddddd;
+    }
+    
+    .couponMore {
+        font-size: 28rpx;
+        color: #686868;
+        position: relative;
+        height: 120rpx;
+    }
+    
+    .couponMore::after,
+    .couponMore::before {
+        position: absolute;
+        content: '';
+        height: 20rpx;
+        border-radius: 10rpx;
+        background: #fff;
+        box-shadow: 0 0 20rpx rgba(0, 0, 0, .1);
+        z-index: 1;
+        height: 30rpx;
+    }
+    
+    .couponMore::after {
+        width: calc(100% - 40rpx);
+        top: 70rpx;
+        left: 20rpx;
+    }
+    
+    .couponMore::before {
+        width: calc(100% - 80rpx);
+        top: 90rpx;
+        left: 40rpx;
+    }
+    
+    .couponMore-text {
+        display: flex;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 99;
+        height: 80rpx;
+        border-radius: 0 0 10rpx 10rpx;
+        line-height: 80rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        background: #fff;
+        box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    }
+    
+    .couponMore-title {
+        flex: 1;
+    }
+    
+    .couponMore-arrow {
+        width: 28rpx;
+        height: 28rpx;
+        margin-top: 26rpx;
+    }
+    
+    .couponCont.active .couponList-img,
+    .couponCont.active .couponList-icon {
+        -webkit-filter: grayscale(100%);
+        -moz-filter: grayscale(100%);
+        -ms-filter: grayscale(100%);
+        -o-filter: grayscale(100%);
+        filter: grayscale(100%);
+        filter: gray;
+    }
+    
+    .coupoTips {
+        position: absolute;
+        top: 22rpx;
+        right: 20rpx;
+        z-index: 99;
+        width: 120rpx;
+        height: 120rpx;
+    }
+</style>
diff --git a/pages/campus/password.vue b/pages/campus/password.vue
new file mode 100644
index 0000000..827a6fa
--- /dev/null
+++ b/pages/campus/password.vue
@@ -0,0 +1,231 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">身份验证</view>
+			</view>
+			<image class="cover" src="/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<button class="campus-form-btn" form-type="submit">设置新密码</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+		
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || ''
+					
+				auth({
+					mobile: mobileNo,
+					code: code,
+					type: 'reset_password'
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.redirectTo({
+						url: '/pages/campus/setPassword'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/campus/register.vue b/pages/campus/register.vue
new file mode 100644
index 0000000..5960bde
--- /dev/null
+++ b/pages/campus/register.vue
@@ -0,0 +1,238 @@
+<template>
+	<view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">用户注册</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+	    <view class="campus-cont">
+	        <form @submit="submitRegister">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue"
+				        name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请输入密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请确认密码" name="password_confirmation"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">注册</button>
+	        </form>
+	    </view>
+	</view>
+</template>
+
+<script>
+    import { send, register } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{
+						uni.showToast({
+						    title   : err.message,
+							icon	:'none',
+						    duration: 2000
+						})
+					})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            submitRegister(e){
+				let formValue = e.detail.value
+				
+				register({
+					mobile					: formValue.mobile,
+					password				: formValue.password,
+					password_confirmation	: formValue.password_confirmation,
+					code					: this.code,
+					parent_id				: 0
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.showModal({
+						title		: "提示",
+						content		: "注册成功",
+						showCancel	: false,
+						confirmText : "确定",
+						success		: modalRes => {
+							if(modalRes.confirm){
+								uni.reLaunch({
+								    url: '/pages/campus/index'
+								})
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/campus/setPassword.vue b/pages/campus/setPassword.vue
new file mode 100644
index 0000000..4875b5f
--- /dev/null
+++ b/pages/campus/setPassword.vue
@@ -0,0 +1,169 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">设置新密码</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="设置新的登录密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="确认新的登录密码" name="newpassword"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">找回</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { passSetup } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+            }
+        },
+        methods: {
+            // 立即登录
+            forgetlogin(e){
+                let newPass  = e.detail.value.newpassword || '',
+					password = e.detail.value.password || ''
+				
+				passSetup({
+					password: password,
+					password_confirmation: newPass
+				}).then(res => {
+					uni.showToast({
+						title: "密码重置成功",
+						icon : 'none'
+					})
+					uni.reLaunch({
+					    url: '/pages/campus/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/campus/signin.vue b/pages/campus/signin.vue
new file mode 100644
index 0000000..f194a20
--- /dev/null
+++ b/pages/campus/signin.vue
@@ -0,0 +1,259 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">中石油活动登录</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/campus_login_02.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code" v-if="!passwordLogin">
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs" v-else>
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="password" placeholder="请输入登录密码" name="password"></input>
+				</view>
+				<view class="resPassword">
+					<navigator url="./password">忘记密码</navigator>
+				</view>
+				<button class="campus-form-btn" form-type="submit">登录</button>
+            </form>
+			<view class="login-box">
+				<view @click="onCutLogin">{{passwordLogin ? '验证码登录': '密码登录'}}</view>
+				<navigator url="./register">快速注册</navigator>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth, passlogin } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+				passwordLogin: false, // 登录方式
+                disabled     : false,
+            }
+        },
+        
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]|16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || '',
+					password = e.detail.value.password || '',
+					loginFunction
+				
+				if(this.passwordLogin){
+					loginFunction = passlogin({
+						mobile	: mobileNo,
+						password: password
+					})
+				}else{
+					loginFunction = auth({
+						mobile: mobileNo,
+						code: code,
+						type: ''
+					})
+				}
+				
+				loginFunction.then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/campus/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 90rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+			navigator{
+				display: inline-block;
+			}
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/campus/购买备份.vue b/pages/campus/购买备份.vue
new file mode 100644
index 0000000..b286935
--- /dev/null
+++ b/pages/campus/购买备份.vue
@@ -0,0 +1,522 @@
+<template>
+    <view>
+        <!-- 卡券 -->
+        <view class="contentBorder">
+            <view class="contentTop">
+                <view class="contentCard">
+                    <view class="contentCard-mark">校园活动</view>
+                    <view class="contentCard-top">
+                        <image class="contentCard-top-img" src="/static/img/tel_img.png" mode="aspectFill"></image>
+                        <view class="contentCard-top-title">
+                            <view class="contentCard-top-text">
+                                {{ detail.title }}
+                            </view>
+                            <view class="contentCard-top-copy">
+                                {{ detail.type_no }}
+                                <text>复制</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="contentCard-bottom">
+                        <view class="contentCard-bottom-explain" @click="noticeClick">
+                            <image src="/static/icon/contentCard_icon.png" mode="aspectFill"></image>购买须知
+                        </view>
+                        <view class="contentCard-bottom-tips">
+                            <view class="contentCard-bottom-title">限时活动</view>
+                            <view class="contentCard-bottom-price">
+                                <view class="contentCard-bottom-present">
+                                    <text>￥</text>{{ detail.price }}
+                                </view>
+                                <view class="contentCard-bottom-cost">
+                                    ￥{{ detail.price }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <view class="contentTop">
+                <view class="contentLabel">
+                    <label>购买数量</label>
+                    <view class="rightsAdd">
+                        <view class="rightsAdd-btn" @tap="goodsNumber('remove')">-</view>
+                        <input class="rightsAdd-input" :value="num" type="number" disabled=""></input>
+                        <view class="rightsAdd-btn" @tap="goodsNumber('plus')">+</view>
+                    </view>
+                </view>
+                <view class="contentLabel">
+                    <label>支付方式</label>
+                    <view class="contentLabel-right">
+                        <view class="contentLabel-right-name">
+                            在线支付
+                        </view>
+                        <view class="contentLabel-right-pay">
+                            <text>沃支付</text>
+                            <text>微信支付</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="contentLabel">
+                    <label v-if="detail.attribute">{{ detail.attribute.form_price }}</label>
+                    <view class="contentLabel-right">
+                        <view class="contentLabel-right-name">
+                            ￥{{ detail.price }}
+                        </view>
+                    </view>
+                </view>
+                <view class="contentLabel">
+                    <label v-if="detail.attribute">{{ detail.attribute.form_pay }}</label>
+                    <view class="contentLabel-right">
+                        <view class="contentLabel-right-name">
+                            ￥{{ amount }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <view class="contentTop contentMargin">
+                <view class="contentTop-introduce">
+                    <view class="contentTop-introduce-title">
+                        内容介绍
+                    </view>
+                    <view class="contentTop-introduce-text">
+                        <rich-text :nodes="content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 按钮 -->
+        <view class="rightsBtn" @tap="payment">
+            <button class="rightsBtn-btn" :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 购买须知 -->
+        <view class="popNoticeBack" :class="{active : noticeState}"></view>
+        <view class="popNotice" :class="{active : noticeState}">
+            <view class="popNotice-text">购买须知</view>
+            <view class="popNotice-cont">
+                <rich-text :nodes="remark"></rich-text>
+            </view>
+            <view class="popNotice-btn" @click="noticeClick">
+                我知道了
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { buy, buySubmit } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                groupId     : '',       //权益id
+                detail      : '',       //权益详情
+                amount      : '',       //总金额
+                num         : 1,        //购买的数量
+                content     : '',       //内容介绍
+                notification: '',       //重要提示
+                remark      : '',       //使用须知
+                disabled    : false,    //购买按钮状态
+                noticeState : false     //使用须知弹出层
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.groupId = options.id
+            this.code    = options.code || ''
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                buy({activity_school_id: this.groupId, qty: this.num}).then(res => {
+                    this.num    = res.qty
+                    this.detail = res.detail
+                    this.amount = res.amount
+                    this.remark = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content= res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(val){
+                let num = this.num
+                if (val == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.num = num
+        
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 购买须知弹框
+            noticeClick() {
+                this.noticeState = !this.noticeState
+            },
+            
+            // 收银台跳转
+            payment() {
+                buySubmit({activity_school_id: this.groupId, qty: this.num, is_deliver: 1}).then(res => {
+                    uni.navigateTo({
+                        url: '/pages/cashier/index?tradeNo=' + res.trade_no + '&type=school' + '&price=' + this.amount
+                    })
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+            
+        }
+    }
+</script>
+
+<style>
+    .contentTop {
+        width: 100vw;
+        background: #FFFFFF;
+        margin-bottom: 30rpx;
+        border-bottom: 2rpx solid #efefef;
+        border-top: 2rpx solid #efefef;
+    }
+    
+    .contentCard {
+        margin: 40rpx;
+        width: calc(100% - 80rpx);
+        background-color: #bc1d30;
+        border-radius: 20rpx;
+        overflow: hidden;
+        color: #ffffff;
+        position: relative;
+    }
+    
+    .contentCard-mark {
+        position: absolute;
+        opacity: .9;
+        background-color: #920011;
+        font-size: 28rpx;
+        padding: 10rpx 20rpx;
+        right: 30rpx;
+        top: 0;
+    }
+    
+    .contentCard-top {
+        text-align: center;
+        padding: 60rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .contentCard-top-img {
+        width: 110rpx;
+        height: 110rpx;
+        border-radius: 50%;
+        margin-bottom: 20rpx;
+        border: 4rpx solid #fb7d7d;
+        display: inline-block;
+    }
+    
+    .contentCard-top-title {
+        font-size: 28rpx;
+    }
+    
+    .contentCard-top-text {
+        font-size: 32rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .contentCard-top-copy {
+        color: #ffc8cf;
+    }
+    
+    .contentCard-top-copy text {
+        border: 2rpx solid #ffc8cf;
+        font-size: 24rpx;
+        border-radius: 30rpx;
+        padding: 0 10rpx;
+        height: 32rpx;
+        line-height: 32rpx;
+        display: inline-block;
+        margin-left: 15rpx;
+        transform : scale(.85)
+    }
+    
+    .contentCard-bottom {
+        background-color: rgba(0,0,0,.15);
+        height: 80rpx;
+        line-height: 80rpx;
+        display: flex;
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        font-size: 28rpx;
+    }
+    
+    .contentCard-bottom-explain {
+        display: flex;
+        flex: 1;
+        opacity: .8;
+    }
+    
+    .contentCard-bottom-explain image {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 18rpx 10rpx 0 0;
+    }
+    
+    .contentCard-bottom-tips,
+    .contentCard-bottom-price {
+        display: flex;
+    }
+    
+    .contentCard-bottom-title {
+        background-color: #e69500;
+        height: 50rpx;
+        line-height: 50rpx;
+        padding: 0 15rpx;
+        border-radius: 10rpx;
+        margin-top: 16rpx;
+        transform : scale(.85)
+    }
+    
+    .contentCard-bottom-title::after {
+        position: absolute;
+        content: '';
+        width: 0;
+        height: 0;
+        border-top: 25rpx solid transparent;
+        border-left: 25rpx solid #e69500;
+        border-bottom: 25rpx solid transparent;
+    }
+    
+    .contentCard-bottom-present {
+        margin: 0 10rpx;
+        font-size: 40rpx;
+    }
+    
+    .contentCard-bottom-present text,
+    .contentCard-bottom-cost {
+        font-size: 24rpx;
+    }
+    
+    .contentCard-bottom-cost {
+        text-decoration: line-through;
+        padding-top: 4rpx;
+    }
+    
+    .contentLabel {
+        display: flex;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        border-bottom: #efefef 2rpx solid;
+        font-size: 30rpx;
+    }
+    
+    .contentLabel:last-child {
+        margin-bottom: 0;
+        border: none;
+    }
+    
+    .contentLabel label {
+        flex: 1;
+        line-height: 54rpx;
+    }
+    
+    .contentLabel-right-name {
+        text-align: right;
+        margin-bottom: 10rpx;
+    }
+    
+    .contentLabel-right-pay text {
+        font-size: 26rpx;
+        padding: 2rpx 10rpx;
+        border-radius: 10rpx;
+        color: #e56012;
+        border: 1rpx solid #e56012;
+        margin-left: 15rpx;
+    }
+    
+    .contentLabel-right-pay text:last-child {
+        color: #29c529;
+        border-color: #29c529;
+    }
+    
+    .rightsAdd {
+       display: flex;
+       border: 2rpx solid #efefef;
+    }
+   
+    .rightsAdd-btn {
+        width: 54rpx;
+        height: 54rpx;
+        line-height: 54rpx;
+        text-align: center;
+        border-radius: 4rpx;
+        font-size: 38rpx;
+        color: #666666;
+    }
+    
+    .rightsAdd-input {
+        width: 80rpx;
+        height: 54rpx;
+        font-size: 30rpx;
+        text-align: center;
+        border-left: 2rpx solid #efefef;
+        border-right: 2rpx solid #efefef;
+    }
+    
+    .contentBorder {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .contentTop-introduce-title {
+        text-align: center;
+        line-height: 100rpx;
+        font-size: 34rpx;
+        position: relative;
+    }
+    
+    .contentTop-introduce-title::after,
+    .contentTop-introduce-title::before{
+        position: absolute;
+        width: 100rpx;
+        height: 2rpx;
+        top: 50rpx;
+        content: '';
+        background-color: #dadada;
+    }
+    
+    .contentTop-introduce-title::after {
+        left: 20%;
+    }
+    
+    .contentTop-introduce-title::before {
+        right: 20%;
+    }
+    
+    .contentTop-introduce-text {
+        padding: 0 40rpx 40rpx;
+        color: #a0a0a2;
+        box-sizing: border-box;
+        font-size: 30rpx;
+    }
+    
+    /* 按钮 */
+    .rightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        background-color: #FFFFFF;
+        z-index: 1002;
+        height: 140rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .rightsBtn-btn {
+        background-color: #bc1d30;
+        color: #ffffff;
+        height: 90rpx;
+        line-height: 90rpx;
+        width: 100%;
+        font-size: 32rpx;
+        padding: 0;
+        margin: 0;
+    }
+    
+    .popNoticeBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        left: 0;
+        top: 0;
+        background: rgba(0,0,0,.7);
+        z-index: 1003;
+        display: none;
+    }
+    
+    .popNoticeBack.active {
+        display: block;
+    }
+    
+    .popNotice {
+        position: fixed;
+        left: 15%;
+        right: 15%;
+        top: 30%;
+        background-color: #FFFFFF;
+        border-radius: 20rpx;
+        overflow: hidden;
+        z-index: 1004;
+        display: none;
+    }
+    
+    .popNotice.active {
+        display: block;
+    }
+    
+    .popNotice-text {
+        text-align: center;
+        font-weight: 600;
+        line-height: 90rpx;
+    }
+    
+    .popNotice-cont {
+        border-top: 2rpx solid #efefef;
+        border-bottom: 2rpx solid #efefef;
+        padding: 50rpx 30rpx;
+        box-sizing: border-box;
+        font-size: 30rpx;
+    }
+    
+    .popNotice-btn {
+        color: #FFFFFF;
+        line-height: 90rpx;
+        font-size: 30rpx;
+        text-align: center;
+        background-color: #e69500;
+    }
+</style>
diff --git a/pages/car/index.vue b/pages/car/index.vue
new file mode 100644
index 0000000..5eddc64
--- /dev/null
+++ b/pages/car/index.vue
@@ -0,0 +1,909 @@
+<template>
+    <view>
+        <!-- 立即购买 -->
+        <view class="newrightsBtn" @tap="submitOrder">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ dataInfo.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ dataInfo.amount }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <view style="padding-bottom: 100px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png"
+                        mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont" v-if="dataInfo.detail">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in dataInfo.detail.logos" :key="index">
+                                <image :src="item" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                        <view class="nowrap rightsCont-btn">
+                            {{ dataInfo.detail.title }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+        
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="dataInfo.detail.goods_cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ dataInfo.detail.title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{ dataInfo.detail.price }}</view>
+                        <view class="rightsAdd">
+                            <!-- @tap="goodsNumber(remove)" -->
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : num != 1}">-</view>
+                            <input class="rightsAdd-input" :value="dataInfo.num" type="number" disabled></input>
+                            <view class="rightsAdd-btn rightsAdd-plus">+</view>
+                            <!-- @tap="goodsNumber(plus)" -->
+                        </view>
+                    </view>
+                </view>
+            </view>
+        
+            <view class="rightsList" style="padding: 0 0 2rpx" v-if="dataInfo.detail.attribute">
+                <view class="rightsLabel">
+                    <view class="rightsLabel-left">{{ dataInfo.detail.attribute.form_type }}</view>
+                    <view class="rightsLabel-right rightsLabel-red">-￥{{ dataInfo.score }}</view>
+                </view>
+                <view class="rightsLabel">
+                    <view class="rightsLabel-left">{{dataInfo.detail.attribute.form_pay}}</view>
+                    <view class="rightsLabel-right">￥{{ dataInfo.amount }}</view>
+                </view>
+            </view>
+        
+            <!-- 规格 -->
+        	<view class="rightsList" v-if="dataInfo.detail.type == 'physical'">
+                <view class="rightsLabel">
+                    <view class="rightsLabel-left">提交方式</view>
+                    <view class="rightsLabel-right rightsLabel-range">
+                        <picker :range="plat.platformCp" :range-key="'name'" @change="platBind">
+                            <view class="tabs-text">
+                                {{ plat.platformCp[plat.platIndex].name }}
+                            </view>
+                        </picker>
+                        <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                    </view>
+                </view>
+                <view class="rightsLabel rightsLabel-address" v-if="plat.platformCp[plat.platIndex].name == '快递'">
+                    <image class="rightsLabel-icon" src="https://card.ysd-bs.com/storage/materials/2021/09/01/new_rightsAddress.png"></image>
+                    <block v-if="dataInfo.detail.address != ''">
+                        <view class="rightsLabel-right" @tap="addressTap">
+                            <view class="rightsLabel-address-text">
+                                <view class="rightsLabel-address-name">{{ dataInfo.detail.address.name }}<view class="rightsLabel-address-tel">{{ dataInfo.detail.mobile }}</view></view>
+                                <text class="nowrap">{{ dataInfo.detail.address.all_address }}</text>
+                            </view>
+                            <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                            <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                添加收货地址
+                            </view>
+                            <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                        </navigator>
+                    </block>
+                </view>
+                <view class="rightsLabel" v-if="plat.platformCp[plat.platIndex].name == '快递'">
+                    <view class="rightsLabel-left">快递运费</view>
+                    <view class="rightsLabel-right rightsLabel-freight">￥{{ dataInfo.freight }}</view>
+                </view>
+        	</view>
+        
+            <!-- 支付方式 -->
+            <!-- <view class="rightsList" style="padding: 0 0 2rpx">
+                <view class="radioList" style="padding: 30rpx">
+                    <radio-group @change="payBind">
+                        <view class="payContList-label">
+                            <view class="payContList-label-name">
+                                <image class="payContList-label-img" src="/static/img/wx.jpg"></image>
+                                微信支付
+                            </view>
+                            <radio class="radio" value="0" checked></radio>
+                        </view>
+                        <view class="payContList-label">
+                            <view class="payContList-label-name">
+                                <image class="payContList-label-img" src="/static/img/wqb.jpg"></image>
+                                沃钱包支付
+                            </view>
+                            <radio class="radio" value="1"></radio>
+                        </view>
+                    </radio-group>
+                </view>
+            </view> -->
+        
+            <!-- 购买须知 -->
+        	<view class="notice">
+        		<view class="noticeTitle" @tap="noticeTap">
+        			<view class="noticeTitle-flex">
+        				<image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+        				购买前请仔细阅读使用须知、内容介绍
+        			</view>
+        			<image class="noticeTitle-row" :class="{active : dataInfo.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+        		</view>
+        		<view class="noticeText" :class="{active : dataInfo.noticeShow}">
+        			<view class="noticeText-top">购买须知</view>
+        			<view class="noticeText-cont">
+        				<rich-text :nodes="dataInfo.remark"></rich-text>
+        			</view>
+        
+        			<view class="noticeText-top">内容介绍</view>
+        			<view class="noticeText-cont">
+        				<rich-text :nodes="dataInfo.content"></rich-text>
+        			</view>
+        		</view>
+        	</view>
+        </view>
+        
+        
+        <!-- 选择收货地址 -->
+        <view class="addressBack" :class="{ active : address.addressShow }" @tap="addressHide"></view>
+        <view class="addressCont" :class="{ active : address.addressShow }">
+        	<view class="addressCont-title uni-border-bottom">
+        		<view class="addressCont-left">请选择收货地址</view>
+        		<view class="addressCont-right" @tap="addSelect">新增收货地址</view>
+        	</view>
+        	<scroll-view class="header-classify" scroll-y="true">
+        		<view class="addressCont-list uni-border-bottom" v-for="(item, index) in address.allAddress" :key="index"
+        			@tap="selectAddress(item.id, item)">
+        			<view class="addressCont-top">
+        				<view class="addressCont-name">{{ item.name }}</view>
+        				<view class="addressCont-tel">{{ item.mobile }}</view>
+        			</view>
+        			<view class="addressCont-text">
+        				{{ item.all_address }}
+        			</view>
+        			<view class="address-tool-icon">选择地址</view>
+        		</view>
+        	</scroll-view>
+        </view>
+        
+    </view>
+</template>
+
+<script>
+    import { washcarBuy, washcarCreate } from '@/apis/interfaces/rights'
+    export default {
+    	data() {
+    		return {
+                dataInfo : {
+                    rightId     : '',    // 权益id
+                    detail      : '',    // 权益详情
+                    welfareId   : '',    // 活动id
+                    amount      : '',    // 总金额
+                    moreAmount  : '',    // 产品金额
+                    num         : 1,     // 购买的数量
+                    score       : '',    // 应付总积分
+                    freight     : '',    // 运费
+                    welfareType : '',    // 权益类型
+                    content     : '',    // 内容介绍
+                    remark      : '',    // 使用须知
+                    noticeShow  : false, // 须知显示状态
+                },
+                address    : {
+                    addefault   : '',    // 默认地址
+                    allAddress  : [],    // 收货地址列表
+                    addressShow : false  // 收货地址显示
+                },
+                plat    : {
+                    platIndex   : 0,    // 选择提交方式下标
+                    isdeliver   : -1,   // 快递还是自提参数
+                    platformCp  : []    // 选择提交数组
+                },
+                pay     : {
+                    payWayIndex : 0,
+                    payWay      : [
+                        {value: 0, name: "微信支付"},
+                        {value: 1, name: "沃钱包支付"}
+                    ]
+                },
+                disabled        : false   // 下单按钮状态
+            }
+        },
+        onLoad(options) {
+            this.dataInfo.rightId   = options.right_id,
+            this.dataInfo.welfareId = options.welfare_id
+            
+            // 获取卡券列表
+            this.couponInfo()
+        },
+        methods:{
+            // 卡券列表
+            couponInfo() {
+                washcarBuy({
+                    welfare_id  : this.dataInfo.welfareId,
+                    right_id    : this.dataInfo.rightId,
+                    qty         : this.dataInfo.num,
+                    address_id  : this.address.addefault.id,
+                    is_deliver  : this.plat.isdeliver
+                }).then(res=>{
+                    let obj    = res.detail.express
+                    let defGet = res.detail.def_get
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+        
+                    if(this.plat.isdeliver == -1){
+                        if(res.detail.type == 'physical') this.plat.isdeliver = res.detail.def_get
+                        if(res.detail.type == 'virtual') this.plat.isdeliver = 1
+                    }
+                    this.dataInfo.detail      = res.detail
+                    this.dataInfo.num         = res.qty
+                    this.dataInfo.freight     = res.freight
+                    this.dataInfo.amount      = res.total
+                    this.dataInfo.moreAmount  = res.amount
+                    this.dataInfo.score       = res.score
+                    this.dataInfo.welfareType = res.type
+                    this.dataInfo.remark      = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.dataInfo.content     = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.plat.platformCp      = arr
+                    this.address.addefault    = res.address
+                    this.address.allAddress   = res.all_address
+                }).catch(err=>{
+                    if(!err.login){
+                        uni.showModal({
+                            title       : '用户登录已过期',
+                            content     : '请重新登录',
+                            showCancel  : false,
+                            success : res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/auth/login'
+                                    })
+                                }
+                            }
+                        })
+                    }
+                })
+            },
+            
+            // 收货地址弹出
+            addressTap() {
+                this.address.addressShow = !this.address.addressShow
+            },
+            
+            // 选择收货地址
+            selectAddress(selectid, selectItem){
+                let new_addressId = selectid,
+                    addressId     = this.address.addefault.id
+                if (new_addressId != addressId) this.address.addefault  = selectItem
+                this.address.addressShow = false
+                // 获取卡券列表
+                this.couponInfo()
+            },
+            
+            // 商品数量加减
+            goodsNumber(type){
+                if(this.dataInfo.welfareType == 'welfare') {
+                    uni.showToast({
+                        title   : '抱歉，只能购买一张',
+                        icon    : 'none'
+                    })
+                    return
+                }
+                let num = this.dataInfo.num
+                if (type == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.dataInfo.num = num
+                // 获取详情
+                this.couponInfo()
+            },
+            
+            // 支付选择
+            payBind(e) {
+                this.pay.payWayIndex = e.detail.value
+            },
+        
+            // 选择提交方式
+            platBind(e) {
+                this.plat.platIndex = e.detail.value
+                this.plat.isdeliver = this.plat.platformCp[e.detail.value].value
+                // 获取详情
+                this.couponInfo()
+            },
+            
+            // 支付提交
+            submitOrder() {
+                if(this.plat.isdeliver.length == 0) {
+                    this.isdeliver = this.dataInfo.detail.def_get
+                }
+                let new_rightId     = this.dataInfo.rightId,
+                    new_welfareId   = this.dataInfo.welfareId,
+                    new_addressId   = this.address.addefault.id,
+                    new_isDeliver   = this.plat.isdeliver,
+                    new_qty         = this.dataInfo.num
+                washcarCreate({
+                    welfare_id: new_welfareId,
+                    right_id: new_rightId,
+                    address_id: new_addressId,
+                    is_deliver: new_isDeliver,
+                    qty: new_qty
+                }).then(res=>{
+                    // 跳转收银台
+                    uni.navigateTo({
+                        url: "/pages/cashier/index?tradeNo=" + res.trade_no + "&price=" + this.dataInfo.amount + "&deliver=" + this.plat.isdeliver + "&activity_type=" + res.type + "&type=default"
+                    })
+                }).catch(err => {});
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 重要提示 */
+    .rightsPoint {
+        position: fixed;
+        left: 0;
+        bottom: 160rpx;
+        background: #eeeeee;
+        z-index: 9;
+        width: 100%;
+        padding: 20rpx 20rpx 10rpx;
+        box-sizing: border-box;
+        .rightsPoint-cont {
+            width: 100%;
+            background: #eeeeee;
+            border-radius: 10rpx;
+            position: relative;
+            max-height: 50vh;
+            overflow-y: scroll;
+            .rightsPoint-top {
+                font-size: 28rpx;
+                display: flex;
+                padding: 0 20rpx 20rpx;
+                box-sizing: border-box;
+                font-weight: 600;
+                image {
+                    width: 36rpx;
+                    height: 36rpx;
+                    margin-right: 10rpx;
+                }
+            }
+            .rightsPoint-text {
+                padding: 0 20rpx;
+                box-sizing: border-box;
+                font-size: 24rpx;
+                line-height: 44rpx;
+                height: 90rpx;
+                transition: height 25s;
+                overflow: hidden;
+                &.active {
+                    height: auto;
+                    transition: 2s;
+                }
+            }
+            .pointMore {
+                text-align: center;
+                width: 100%;
+                background: #eeeeee;
+                height: 80rpx;
+                line-height: 82rpx;
+                position: relative;
+                margin-top: 10rpx;
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+                text {
+                    font-size: 28rpx;
+                    color: #c38e00;
+                    animation: dong 1.8s infinite;
+                    display: inline-block;
+                }
+                image {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-left: 4rpx;
+                    vertical-align: -4rpx;
+                    animation: dong 1.8s infinite;
+                }
+                @keyframes dong {
+                    0% {
+                        transform: translate(0px, 0px);
+                    }
+                
+                    50% {
+                        transform: translate(0px, -6rpx);
+                    }
+                
+                    100% {
+                        transform: translate(0px, 0px);
+                    }
+                }
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        margin-bottom: 30rpx;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 卡券权益内容
+    .cont {
+        width: 100%;
+        overflow: hidden;
+    }
+    .contBack {
+        position: relative;
+        width: 200%;
+        height: 340rpx;
+        left: -50%;
+        text-align: center;
+        background: #000000;
+        border-radius: 0 0 100% 100%;
+        overflow: hidden;
+        &::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .classBack {
+            position: absolute;
+            left: 28%;
+            right: 30%;
+            width: 44%;
+            top: 40rpx;
+        }
+        .classCircle {
+            position: relative;
+            &::before {
+                position: absolute;
+                border-radius: 50%;
+                content: '';
+                z-index: 1;
+                background-color: rgba(255,255,255,.1);
+                left: 20%;
+                top: -20rpx;
+                width: 260rpx;
+                height: 260rpx;
+            }
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .rightsCont-tips {
+                color: #fff;
+            }
+            .welfareCont-top {
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 规格权益
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        box-sizing: border-box;
+    }
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 30rpx;
+        box-sizing: border-box;
+        color: #6f7880;
+        font-size: 30rpx;
+        .rightsLabel-left {
+            flex: 1;
+            color: #747d86;
+        }
+        .rightsLabel-right {
+            display: flex;
+            font-size: 28rpx;
+            font-weight: 700;
+            &.rightsLabel-red{
+                color: #ff5b5d;
+            }
+            &.rightsLabel-score {
+                font-size: 34rpx;
+                color: #000000;
+            }
+        }
+        .rightsLabel-range {
+            display: flex;
+            color: #000;
+            font-weight: 600;
+        }
+        .rightsLabel-row {
+            width: 38rpx;
+            height: 38rpx;
+            margin: 2rpx 0 0 6rpx;
+        }
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        margin-top: 30rpx;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    // 购买按钮
+    .rightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 100rpx;
+        z-index: 9;
+        background: #fff;
+        button,
+        text {
+            display: block;
+            margin: 12rpx 30rpx;
+            width: calc(100% - 60rpx) !important;
+            height: 74rpx !important;
+            line-height: 74rpx !important;
+            padding: 0;
+            background: #eacf88;
+            text-align: center;
+            border-radius: 60rpx;
+            font-size: 30rpx;
+        }
+    }
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 收货地址新增样式
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+    }
+    
+    .rightsLabel-address::after,
+    .rightsLabel-address::before {
+        position: absolute;
+        content: '';
+        left: 30rpx;
+        width: calc(100% - 60rpx);
+        height: 2rpx;
+        background-color: #bfbfbf;
+    }
+    
+    .rightsLabel-address::after {
+        top: 0;
+    }
+    
+    .rightsLabel-address::before {
+        bottom: 0;
+    }
+    
+    .rightsLabel-address text {
+        display: inline-block;
+        width: calc(100% - 46rpx);
+    }
+    
+    .rightsLabel-address .rightsLabel-right {
+        width: calc(100% - 90rpx);
+        margin-left: 20rpx;
+        color: #000000;
+    }
+    
+    .rightsLabel-address-text {
+        flex: 1;
+    }
+    
+    .rightsLabel-address .rightsLabel-row {
+        margin-top: 30rpx;
+    }
+    
+    .rightsLabel .rightsLabel-icon {
+        width: 70rpx;
+        height: 70rpx;
+        margin-top: 14rpx;
+    }
+    
+    .rightsLabel-address-name {
+        display: flex;
+        font-size: 32rpx;
+        margin-bottom: 10rpx;
+    }
+    
+    .rightsLabel-address-tel {
+        padding-left: 30rpx;
+        color: #959595;
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/cashier/index.vue b/pages/cashier/index.vue
new file mode 100644
index 0000000..3014bdc
--- /dev/null
+++ b/pages/cashier/index.vue
@@ -0,0 +1,708 @@
+<template>
+    <view>
+        <view class="cashierTips">
+            <image src="/static/img/cashierTips_icon.png" mode="aspectFill"></image>注：推荐使用沃支付，可在享优惠！
+        </view>
+        <view class="cashierCont">
+            <view class="cashierCont-title">
+                <text>支付类型</text>线上支付
+            </view>
+            <view class="cashierCont-price">
+                <block v-if="this.defaultType == 'unicom'">
+                    <view class="cashierCont-price-title">
+                        中奖用户0元支付
+                    </view>
+                    <view class="cashierCont-price-title">
+                        具体支付金额以页面显示为准
+                    </view>
+                </block>
+                <block v-else>
+                    <view class="cashierCont-price-title">
+                        付款金额
+                    </view>
+                    <view class="cashierCont-price-number">
+                        ￥{{ defaultPrice }}
+                    </view>
+                </block>
+            </view>
+            
+            <view class="cashierCont-pay">
+                <view class="cashierCont-pay-title">
+                    付款方式<text>*</text>
+                </view>
+                <view class="cashierCont-pay-way">
+                    <radio-group @change="radioChange" v-if="this.defaultType == 'unicom'">
+                        <view class="cashierCont-way-label cashierCont-way-unicom" :class="{active : current == 1}">
+                            <view class="payContList-label-name">
+                                <image class="payContList-label-img" src="/static/img/wqb.jpg"></image>
+                                <text>沃支付支付</text>
+                            </view>
+                            <radio class="radio" value="1" checked></radio>
+                        </view>
+                    </radio-group>
+                    <radio-group @change="radioChange" v-else>
+                        <view class="cashierCont-way-label" :class="{active : current == 1}">
+                            <view class="payContList-label-name">
+                                <image class="payContList-label-img" src="/static/img/wqb.jpg"></image>
+                                <text>沃支付支付</text>
+                            </view>
+                            <radio class="radio" value="1" checked></radio>
+                        </view>
+                        <view class="cashierCont-way-label" :class="{active : current == 2}" v-if="this.defaultType != 'unicom'">
+                            <view class="payContList-label-name">
+                                <image class="payContList-label-img" src="/static/img/wx.jpg"></image>
+                                <text>微信支付</text>
+                            </view>
+                            <radio class="radio" value="2"></radio>
+                        </view>
+                    </radio-group>
+                </view>
+                <button class="payBtn" @tap="submitPay" :disabled="disabledOk">立即支付</button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { getAuthUrl, wpayH5Info, h5Pay } from '@/apis/interfaces/rights'
+    const jweixin = require('jweixin-module');  //获取微信支付
+    export default {
+        data() {
+            return {
+                defaultPrice    : '',       //支付金额
+                disabledOk      : false,    //支付按钮状态
+                current         : 1,        //支付下标
+                defaultNo       : '',       //权益订单编号
+                defaultType     : '',       //购买类型  school为校园活动  oil为中石油活动 default为洗车券+权益+周五福利 giftPEnv为月兑活动
+                activityType    : '',       //活动类型  welfare为周五福利日  right为权益
+                defaultDeliver  : ''        //提交方式  0为快递  1为自提
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 判断是否微信授权登录过  只有外部游览器才用到（支付需要授权微信环境）
+            let status = navigator.userAgent.toLowerCase();
+            if (status.match(/MicroMessenger/i) == "micromessenger" && !options.code) {
+                let locationUrl = window.location.pathname.substr(1) + window.location.search
+                getAuthUrl(locationUrl).then(res=> {
+                    window.location.href = res
+                })
+            }
+            this.openid  = options.openid || ''
+            this.code    = options.code || ''  //用code换取oppid
+            
+            // 页面跳转参数接收
+            this.defaultPrice   = options.price
+            this.defaultNo      = options.tradeNo
+            this.defaultType    = options.type
+            this.activityType   = options.activity_type
+            this.defaultDeliver = options.deliver
+        },
+		
+		// 生命周期函数--监听页面显示
+		onShow() {
+		    // 存储环境-月兑活动
+		    getApp().globalData.envType = 'giftPEnv'
+		},
+		
+        methods: {
+            // 支付方式选择
+            radioChange(e) {
+                this.current = e.detail.value
+            },
+            
+            // 支付提交
+            submitPay() {
+                // this.current为1的时候为沃支付-直接跳转h5
+                if (this.current == 1) {
+                    // const newUrl = "https://lifetest.ysd-bs.com/unicom/payment?trade_no=" + this.defaultNo  // 测试地址
+					const newUrl = "https://card.ysd-bs.com/unicom/payment?trade_no=" + this.defaultNo  // 正式地址
+                    window.location.href = newUrl
+                }
+                // this.current为1的时候为微信支付
+                if (this.current == 2) {
+                    // 调取微信支付
+                    this.wechatPayment();
+                }
+            },
+            
+            // 微信支付数据
+            wechatPayment() {
+                let status = navigator.userAgent.toLowerCase();
+                if (status.match(/MicroMessenger/i) == "micromessenger") {
+                    // 微信浏览器-获取
+                    this.wxBrowser();
+                }else {
+                    // 普通浏览器(网址游览器)
+                    this.outBrowser();
+                }
+            },
+            
+            // 当支付环境为微信游览器情况下
+            wxBrowser() {
+                wpayH5Info({
+                    url: location.href.split('#')[0],
+                    list:'chooseWXPay'
+                }).then(wechatConfig => {
+                    let wxConfig = JSON.parse(wechatConfig)
+                    jweixin.config({
+                        appId: wxConfig.appId,
+                        debug: false,
+                        jsApiList: wxConfig.jsApiList,
+                        signature: wxConfig.signature,
+                        nonceStr: wxConfig.nonceStr,
+                        timestamp: wxConfig.timestamp
+                    })
+                    jweixin.ready(() => {
+                        // activityType=right为权益 支付;  activityType=welfare为周五福利日 支付
+                        let wechaUrl = ''  // 定义接口来源名称
+                        if (this.activityType == 'welfare') wechaUrl = 'payments/welfare/wechat'// 周五福利日支付接口
+                        if (this.activityType == 'right') wechaUrl = 'payments/wechat' //权益支付接口
+                        h5Pay(wechaUrl, {
+                            channel: 'h5',
+                            trade_no: this.defaultNo,
+                            code: this.code
+                        }).then(wechatRes => {
+                            let wechatPay = JSON.parse(wechatRes)
+                            jweixin.chooseWXPay({
+                                timestamp: wechatPay.timeStamp,
+                                nonceStr: wechatPay.nonceStr, 
+                                package: wechatPay.package,
+                                signType: wechatPay.signType,
+                                paySign: wechatPay.paySign,
+                                success: payRes => {
+                                    this.disabledOk = true
+                                    uni.showToast({
+                                        title: '支付成功',
+                                        icon : 'success'
+                                    })
+                                    
+                                    // 校园活动成功跳转
+                                    if(this.defaultType == 'school') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/campus/myCoupon'
+                                            })
+                                        },3000)
+                                    }
+                                    
+                                    // 中石油活动活动成功跳转
+                                    if(this.defaultType == 'oil') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/oil/myCoupon'
+                                            })
+                                        },3000)
+                                    }
+                                    
+                                    // 中国联通回馈活动成功跳转
+                                    if(this.defaultType == 'unicom') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/unicom/index'
+                                            })
+                                        },3000)
+                                    }
+									
+									// 月兑活动成功跳转
+									if(this.defaultType == 'giftPEnv') {
+									    setTimeout(()=>{
+									        uni.reLaunch({
+									            url: '/pages/giftPack/index'
+									        })
+									    },3000)
+									}
+                                    
+                                    // 洗车券+权益+福利成功跳转  获取
+                                    if(this.defaultType == 'default') {
+                                        this.successUrl();
+                                    }
+                                },
+                                cancel: () =>{
+                                    this.disabledOk = true
+                                    
+                                    uni.showToast({
+                                        title: '取消支付',
+                                        icon : 'success'
+                                    })
+                                    
+                                    // 校园活动失败跳转
+                                    if(this.defaultType == 'school') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/campus/index'
+                                            })
+                                        },3000)
+                                    }
+                                    
+                                    // 中石油活动活动成功跳转
+                                    if(this.defaultType == 'oil') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/oil/index'
+                                            })
+                                        },3000)
+                                    }
+									
+									// 月兑活动成功跳转
+									if(this.defaultType == 'giftPEnv') {
+									    setTimeout(()=>{
+									        uni.reLaunch({
+									            url: '/pages/giftPack/index'
+									        })
+									    },3000)
+									}
+                                    
+                                    // 中国联通回馈活动成功跳转
+                                    if(this.defaultType == 'unicom') {
+                                        setTimeout(()=>{
+                                            uni.reLaunch({
+                                                url: '/pages/unicom/index'
+                                            })
+                                        },3000)
+                                    }
+                                    
+                                    // 洗车券+权益+福利失败跳转 获取
+                                    if(this.defaultType == 'default') {
+                                        this.failUrl();
+                                    }
+                                }
+                            })
+                        })
+                    })
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                    if (!err.login) {
+                        // 跳转校园活动登录页面
+                        if (this.defaultType == 'school') {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.reLaunch({
+                                            url: '/pages/campus/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                        
+                        // 跳转中石油活动登录页面
+                        if (this.defaultType == 'oil') {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.reLaunch({
+                                            url: '/pages/oil/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+						
+						// 月兑活动成功跳转
+						if(this.defaultType == 'giftPEnv') {
+							uni.showModal({
+							    title: '用户登录已过期',
+							    content: '请重新登录',
+							    showCancel: false,
+							    success: res => {
+							        if (res.confirm) {
+							            uni.reLaunch({
+							                url: '/pages/giftPack/signin'
+							            });
+							        }
+							    }
+							})
+						}
+                        
+                        // 中国联通回馈活动成功跳转
+                        if (this.defaultType == 'unicom') {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.reLaunch({
+                                            url: '/pages/unicom/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                        
+                        // 跳转本时生活平台登录页面
+                        if (this.defaultType == 'default') {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.reLaunch({
+                                            url: '/pages/auth/login'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 车券+权益+福利成功跳转  数据
+            successUrl() {
+                if(this.activityType == 'welfare'){
+                    setTimeout(()=>{
+                        if(this.defaultDeliver == 1) {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=welfareGoods'
+                            })
+                        } else {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=welfare'
+                            })
+                        }
+                    },3000)
+                }
+                if(this.activityType == 'right'){
+                    setTimeout(()=>{
+                        if(this.defaultDeliver == 1) {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=rightsCoupons'
+                            })
+                        } else {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=rights'
+                            })
+                        }
+                    },3000)
+                }
+            },
+            
+            // 车券+权益+福利失败跳转  数据
+            failUrl() {
+                if(this.activityType == 'welfare'){
+                    setTimeout(()=>{
+                        if(this.defaultDeliver == 1) {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=welfareGoods&stateType=unpay'
+                            })
+                        } else {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=welfare&stateType=unpay'
+                            })
+                        }
+                    },3000)
+                }
+                if(this.activityType == 'right'){
+                    setTimeout(()=>{
+                        if(this.defaultDeliver == 1) {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=rightsCoupons&stateType=unpay'
+                            })
+                        } else {
+                            uni.reLaunch({
+                                url: '/pages/order/order?orderType=rights&stateType=unpay'
+                            })
+                        }
+                    },3000)
+                }
+            },
+            
+            // 当为外部游览器环境
+            outBrowser(){
+                wechatH5({
+                    channel: 'mweb',
+                    trade_no: this.defaultNo
+                }).then(mwebRes => {
+                    let url = mwebRes
+                    let newUrl = ''
+                    
+                    // 校园活动购买
+                    if(this.defaultType == 'school') {
+                        newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/campus/myCoupon'
+                        // #ifdef H5
+                        window.location.href = newUrl
+                        // #endif
+                    }
+                    
+                    // 中石油活动购买
+                    if(this.defaultType == 'oil') {
+                        newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/oil/myCoupon'
+                        // #ifdef H5
+                        window.location.href = newUrl
+                        // #endif
+                    }
+					
+					// 月兑活动成功跳转
+					if(this.defaultType == 'giftPEnv') {
+					    newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/giftPack/myCoupon'
+					    // #ifdef H5
+					    window.location.href = newUrl
+					    // #endif
+					}
+                    
+                    // 中国联通回馈活动购买
+                    if(this.defaultType == 'unicom') {
+                        newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/unicom/index'
+                        // #ifdef H5
+                        window.location.href = newUrl
+                        // #endif
+                    }
+                    
+                    // 洗车券+权益+福利购买
+                    if(this.defaultType == 'default') {
+                        if (this.activityType == 'welfare') {
+                            if (this.defaultDeliver == 1) {
+                                newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/order/order?orderType=welfareGoods'
+                                // #ifdef H5
+                                window.location.href = newUrl
+                                // #endif
+                            } else {
+                                newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/order/order?orderType=welfare'
+                                // #ifdef H5
+                                window.location.href = newUrl
+                                // #endif
+                            }
+                        }
+                        if (this.activityType == 'right') {
+                            if (this.defaultDeliver == 1) {
+                                newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/order/order?orderType=rightsCoupons'
+                                // #ifdef H5
+                                window.location.href = newUrl
+                                // #endif
+                            } else {
+                                newUrl = url + '&redirect_url=' + window.location.protocol + '//' + window.location.host + '/pages/order/order?orderType=rights'
+                                // #ifdef H5
+                                window.location.href = newUrl
+                                // #endif
+                            }
+                        }
+                    }
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                    
+                    // 跳转校园活动登录页面
+                    if (this.defaultType == 'school') {
+                        if (!err.login) {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/campus/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                    
+                    // 跳转中石油活动登录页面
+                    if (this.defaultType == 'oil') {
+                        if (!err.login) {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/oil/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+					
+					// 月兑活动成功跳转
+					if(this.defaultType == 'giftPEnv') {
+						uni.showModal({
+						    title: '用户登录已过期',
+						    content: '请重新登录',
+						    showCancel: false,
+						    success: res => {
+						        if (res.confirm) {
+						            uni.reLaunch({
+						                url: '/pages/giftPack/signin'
+						            });
+						        }
+						    }
+						})
+					}
+                    
+                    // 中国联通回馈活动登录页面
+                    if (this.defaultType == 'unicom') {
+                        if (!err.login) {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/unicom/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                    
+                    // 跳转本时生活平台登录页面
+                    if (this.defaultType == 'default') {
+                        if (!err.login) {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/auth/login'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #bc1d30;
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .cashierTips {
+        background-color: #FFFFFF;
+        font-weight: 600;
+        font-size: 30rpx;
+        border-radius: 10rpx;
+        margin-bottom: 40rpx;
+        line-height: 80rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        color: #e69500;
+        display: flex;
+        image {
+            width: 32rpx;
+            height: 32rpx;
+            margin: 24rpx 10rpx 0 0;
+        }
+    }
+    
+    .cashierCont {
+        width: 100%;
+        background-color: #ffffff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        border-radius: 20rpx;
+        overflow: hidden;
+    }
+    .cashierCont-title text {
+        color: #7e7d81;
+        padding-right: 30rpx;
+    }
+    
+    .cashierCont-price {
+        text-align: center;
+        margin: 90rpx 0;
+        color: #bc1d30;
+    }
+    
+    .cashierCont-price-title {
+        font-size: 34rpx;
+        margin-bottom: 10rpx;
+    }
+    
+    .cashierCont-price-number {
+        font-size: 60rpx;
+    }
+    
+    .cashierCont-pay-title {
+        color: #7e7d81;
+        margin-bottom: 40rpx;
+        text{
+            color: #bc1d30;
+            padding-left: 10rpx;
+        }
+    }
+    
+    .cashierCont-pay-way {
+        height: 240rpx;
+    }
+    
+    .cashierCont-way-label {
+        float: left;
+        border: 2rpx solid #e8e8e8;
+        box-sizing: border-box;
+        padding: 30rpx 0;
+        border-radius: 10rpx;
+        width: calc(50% - 84rpx);
+        text-align: center;
+        margin: 0 40rpx;
+        font-size: 30rpx;
+        position: relative;
+        &.active {
+            border-color: #bc1d30;
+            color: #bc1d30;
+            box-shadow: 0 10rpx 20rpx rgba(188, 29, 48 ,.3);
+        }
+        radio {
+            opacity: 0;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            left: 0;
+            top: 0;
+        }
+        image {
+            width: 90rpx;
+            height: 90rpx;
+            display: block;
+            margin: 0 auto 20rpx;
+        }
+    }
+    .cashierCont-way-unicom {
+        width: calc(100% - 84rpx);
+    }
+    .payBtn {
+        background-color: #bc1d30;
+        color: #ffffff;
+        height: 90rpx;
+        line-height: 90rpx;
+        width: 100%;
+        font-size: 32rpx;
+        padding: 0;
+        border-radius: 80rpx;
+        margin: 80rpx 0 40rpx;
+    }
+    
+    .payBtn[disabled] {
+        background: #eaeaea !important;
+    }
+
+</style>
diff --git a/pages/classify/classify.vue b/pages/classify/classify.vue
new file mode 100644
index 0000000..559074b
--- /dev/null
+++ b/pages/classify/classify.vue
@@ -0,0 +1,433 @@
+<template>
+    <view>
+        <!-- 权益数据 -->
+        <view class="cont">
+            <view class="contBack">
+                <image class="classBack" src="https://card.ysd-bs.com/storage/materials/2021/09/01/class_back_01.png" mode="scaleToFill"></image>
+                <view class="classCircle"></view>
+                <view class="rightsCont">
+                    <view class="rightsCont-tips" v-if="infoData.two_title != null">
+                        {{ infoData.two_title }}
+                    </view>
+                    <view class="nowrap rightsCont-title">
+                        {{ infoData.three_title == null ? '' : infoData.three_title }}
+                    </view>
+                    <view class="nowrap rightsCont-btn">
+                        {{ infoData.two_description }}
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 公告 -->
+        <view class="indexNews">
+            <image src="/static/icon/news_icon.png"></image>
+            <view class="marquee_container" style="--marqueeWidth--:-30em">
+                <view class="marquee_text" :class="{active : noticeData.length > 20}">{{ noticeData }}</view>
+            </view>
+        </view>
+        
+        <!-- 卡券专区 -->
+        <view class="special">
+            <view class="special-title">卡券专区</view>
+            <view class="special-list">
+                <block v-if="infoItems.length > 0">
+                    <view class="special-label" v-for="(item,index) in infoItems" :key="index" @click="rightNav(item.right_config_id, item.from)">
+                        <view class="special-rebate" v-if="item.label != ''">{{ item.label }}</view>
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <block v-if="item.logos != ''">
+                                <view class="welfareCont-list-img" v-for="(items,indexItem) in item.logos" :key="indexItem">
+                                    <image :src="items" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <view class="welfareCont-list-img">
+                                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/14/defaultImg.png" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                        </scroll-view>
+                        <view class="special-text">
+                            <view class="nowrap special-name">{{ item.title }}</view>
+                            <view class="special-tips">{{ item.subtitle }}</view>
+                        </view>
+                    </view>
+                </block>
+                <block v-else>
+                    <view class="legalTips">
+                        <image src="/static/img/null_icon.png"></image>
+                        <text>抱歉, 暂无内容</text>
+                    </view>
+                </block>
+            </view>
+        </view>
+        
+        <!-- 购买须知 -->
+        <view class="notice">
+            <view class="noticeTitle" @click="noticeTap">
+                <view class="noticeTitle-flex">
+                    <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                    购买前请仔细阅读内容介绍
+                </view>
+                <image class="noticeTitle-row" :class="{active : contentShow}" src="/static/icon/arrow_right_black.png"></image>
+            </view>
+            <view class="noticeText" :class="{active : contentShow}">
+                <view class="noticeText-cont">
+                    <rich-text :nodes="content"></rich-text>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { classify, washcarUrl } from '@/apis/interfaces/rights'
+    export default {
+    	data() {
+    		return {
+                noticeData : '',     // 公告
+                infoData   : '',     // 权益数据
+                infoItems  : '',     // 卡券专区
+                content    : '',     // 内容简介
+                contentShow: false   // 内容简介-显示状态
+            }
+        },
+        onLoad(options) {
+            this.indexNav(options.id,options.areaname,options.latitude,options.userlng)
+        },
+        methods:{
+           // 卡权益分类
+           indexNav(id, areaname,latitude,userlng) {
+               classify(id, {
+                   area_name: areaname,
+                   user_lng : latitude,
+                   user_lat : userlng
+               }).then(res=>{
+                   this.noticeData  = res.notice
+                   this.infoData    = res.info
+                   this.infoItems   = res.items
+                   this.content     = res.info.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+               }).catch(err=>{
+                    if(!err.login){
+                        // 写入缓存
+                        uni.setStorage({
+                           key     : 'token',
+                           data    : ''
+                        })
+                    }
+               })
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.contentShow = !this.contentShow
+            },
+            
+            // 活动中心权益跳转详情
+            rightNav(rightid,rightfrom) {
+                if(uni.getStorageSync("token")) {
+                    if(rightfrom == 'washcar') {
+                        // 先做成固定跳转
+                        // uni.navigateTo({
+                        //     url: "/pages/car/index?welfare_id=" + "&right_id=" +rightid
+                        // })
+                        // return
+                        washcarUrl({
+                            welfare_id      : '',
+                            right_config_id : rightid
+                        }).then(res=>{
+                            const newUrl = res
+                            let url= encodeURIComponent(newUrl)
+                            uni.redirectTo({
+                                // 跳转到webview页面
+                                url: `/pages/washcar/washcar?url=${url}`
+                            });
+                        })
+                    } else {
+                        // 跳转分类页
+                        uni.navigateTo({
+                            url: '/pages/rights/index?id=' + rightid
+                        })
+                    }
+                    return
+                }
+                uni.navigateTo({
+                    url: "/pages/auth/login"
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 权益数据
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 400rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            &::after {
+                width: 100%;
+                height: 30rpx;
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                z-index: 2;
+                content: '';
+                background-image: linear-gradient(transparent, rgba(0,0,0,.25));
+            }
+            &::before {
+                position: absolute;
+                border-radius: 50%;
+                content: '';
+                z-index: 1;
+                background-color: rgba(255,255,255,.1);
+            }
+            .classBack {
+                position: absolute;
+                left: 30%;
+                right: 30%;
+                width: 40%;
+                top: 40rpx;
+            }
+            .classCircle {
+                position: relative;
+                &::after {
+                    position: absolute;
+                    border-radius: 50%;
+                    content: '';
+                    z-index: 1;
+                    background-color: rgba(255,255,255,.1);
+                }
+            }
+            .rightsCont {
+                position: absolute;
+                z-index: 3;
+                left: calc(30% - 2rpx);
+                right: calc(30% - 2rpx);
+                width: calc(40% + 4rpx);
+                top: 58rpx;
+                .rightsCont-tips {
+                    color: #fff;
+                }
+                .rightsCont-title {
+                    color: #63320a;
+                    font-size: 60rpx;
+                    margin: 60rpx 0 20rpx;
+                    padding: 0 20rpx;
+                    box-sizing: border-box;
+                }
+                .rightsCont-btn {
+                    background-color: #f4dfcc;
+                    width: 100%;
+                    line-height: 70rpx;
+                    font-size: 38rpx;
+                    color: #2d2d2d;
+                    padding: 0 20rpx;
+                    box-sizing: border-box;
+                }
+            }
+        }
+    }
+    
+    // 公告
+    .indexNews {
+        display: flex;
+        font-size: 28rpx;
+        line-height: 46rpx;
+        background: #c4c4c4;
+        border-radius: 10rpx;
+        padding: 25rpx 20rpx;
+        box-sizing: border-box;
+        margin: 30rpx 20rpx;
+        image {
+            width: 42rpx;
+            height: 42rpx;
+            margin: 4rpx 20rpx 0 0;
+        }
+        .marquee_container {
+            width: calc(100% - 40rpx);
+            overflow: hidden;
+            &:hover {
+                /* 不起作用 */
+                animation-play-state: paused;
+            }
+            .marquee_text {
+                font-size: 28rpx;
+                display: inline-block;
+                white-space: nowrap;
+                &.active {
+                    animation-name: around;
+                    animation-duration: 20s;
+                    /*过渡时间*/
+                    animation-iteration-count: infinite;
+                    animation-timing-function: linear;
+                }
+                /*首页跑马灯效果*/
+                @keyframes around {
+                    from {
+                        margin-left: 60rpx;
+                    }
+                    to {
+                        /* var接受传入的变量 */
+                        margin-left: var(--marqueeWidth--);
+                    }
+                }
+            }
+        }
+    }
+    
+    // 卡券专区
+    .special {
+        border-radius: 10rpx;
+        padding: 25rpx 20rpx;
+        box-sizing: border-box;
+        background: #fff;
+        margin: 30rpx 20rpx;
+        .special-list {
+            margin: 20rpx -10rpx 0;
+            flex-wrap: wrap;
+            display: flex;
+            .special-label {
+                margin: 10rpx;
+                width: calc(50% - 20rpx);
+                height: 330rpx;
+                flex: 0 0 calc(50% - 20rpx);
+                border: 4rpx solid #fb9b00;
+                background-color: #ffe0b8;
+                border-radius: 10rpx;
+                text-align: center;
+                padding: 20rpx 0;
+                box-sizing: border-box;
+                position: relative;
+                .special-rebate {
+                    position: absolute;
+                    top: -30rpx;
+                    right: 10rpx;
+                    background: #fe0002;
+                    color: #fff;
+                    border-radius: 30rpx;
+                    line-height: 52rpx;
+                    height: 52rpx;
+                    font-size: 26rpx;
+                    padding: 0 20rpx;
+                    font-weight: 600;
+                }
+                .welfareCont-top {
+                    white-space: nowrap;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: space-around;
+                    width: 100%;
+                    padding: 0 10rpx;
+                    box-sizing: border-box;
+                    margin: 10rpx 0;
+                    .welfareCont-list-img {
+                        border: 2rpx solid #eccc69;
+                        border-radius: 50%;
+                        width: 100rpx;
+                        height: 100rpx;
+                        display: inline-block;
+                        margin: 0 10rpx;
+                        overflow: hidden;
+                        image {
+                            width: 100%;
+                            height: 100%;
+                        }
+                    }
+                }
+                .special-text {
+                    padding: 0 15rpx;
+                    box-sizing: border-box;
+                    position: relative;
+                    font-size: 26rpx;
+                    border-top: 4rpx dashed #fb9b00;
+                    margin-top: 20rpx;
+                    padding-top: 20rpx;
+                    .special-name {
+                        color: #6f4a2d;
+                        font-weight: 600;
+                        font-size: 28rpx;
+                    }
+                    .special-tips {
+                        background-color: #242424;
+                        color: #fff;
+                        border-radius: 10rpx;
+                        padding: 4rpx 20rpx;
+                        line-height: 46rpx;
+                        height: 46rpx;
+                        margin-top: 20rpx;
+                        font-size: 24rpx;
+                        display: inline-block;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 内容介绍
+    .notice {
+        border-radius: 10rpx;
+        padding: 25rpx 20rpx;
+        box-sizing: border-box;
+        background: #c4c4c4;
+        margin: 30rpx 20rpx;
+        .noticeTitle {
+            color: #747d86;
+            display: flex;
+            line-height: 46rpx;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                color: #000;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 32rpx;
+                height: 32rpx;
+                margin-top: 6rpx;
+                transform:rotate(-180deg);
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    /* 权益提示 */
+    .legalTips {
+        text-align: center;
+        font-size: 26rpx;
+        color: #999;
+        image {
+            width: 180rpx;
+            height: 180rpx;
+            display: block;
+            margin: 0 auto;
+        }
+    }
+</style>
diff --git a/pages/code/code.vue b/pages/code/code.vue
new file mode 100644
index 0000000..9d56bb3
--- /dev/null
+++ b/pages/code/code.vue
@@ -0,0 +1,374 @@
+<template>
+    <view class="content">
+        <view class="codeTitle">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/code_title.png" mode="widthFix"></image>
+        </view>
+        <view class="codeCont">
+            <view class="codeCont-tisp">
+                <text>每邀请一位好友注册成功后</text>
+                <text>您将获得30元消费红包奖励</text>
+            </view>
+            <view class="codeCont-text">
+                <image class="codeCont-avatar" :src="userInfo.avatar" mode="aspectFill"></image>
+                <view class="codeCont-name">
+                    {{ userInfo.nickname }}
+                </view>
+            </view>
+            <view class="codeCont-code">
+                <view class="codeCont-title">
+                    <view class="codeCont-title-text">邀好友享福利</view>
+                    <view class="codeCont-title-tips">邀请好友加入本时生活</view>
+                </view>
+                <image class="codeCont-img" :src="qrcode" mode="aspectFill"></image>
+                <view class="codeShare-label" @tap="saveImg" hover-class="none">生成海报</view>
+            </view>
+        </view>
+        
+        <!-- 海报canvas -->
+        <canvas class="canvasImg" canvas-id="qrcodeCard"></canvas>
+        
+        <!-- 图片弹出层 -->
+        <view class="user-lay sign-img-lay" v-if="isImgLay">
+            <view class="user-back">
+                <image class="user-back-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/code_share.png" mode="widthFix"></image>
+                <view class="user-back-cont">
+                    <view class="codeBack-yard-name">
+                        <view class="codeBack-yard-title">扫码享福利</view>
+                        <view>邀请好友加入本时生活</view>
+                    </view>
+                    <image :src="qrcode" mode="aspectFill"></image>
+                </view>
+            </view>
+            <view class="sign-img-btn" @tap="saveImg">长按图片保存二维码<image class="longpress" src="/static/img/long_press.png" mode="widthFix"></image></view>
+            <button class="sign-img-btn remove-btn" size="mini" @tap="removeSaveImg">取消</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { myshare } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                qrcode  : '', //二维码
+                userInfo: '', //我的信息
+                isImgLay: false, //是否显示图片弹出层
+                parentId: '' ,//是否分享进入
+                qrcodeImg: '' //海报图片
+    		}
+    	},
+        onLoad(options) {},
+        onShow() {
+            myshare({
+                channel: "h5",
+                parent_id: '',
+                url: 'pages/index/index?type=shareLogin'
+                
+            }).then(res=>{
+                this.qrcode   = res.qrcode
+                this.userInfo = res.user
+            }).catch(err=>{})
+        },
+        methods: {
+            // 绘图
+            dowImg(){
+                uni.showLoading({
+                    title: '加载中',
+                })
+                let avatarImg = new Promise(success=>{
+                    uni.getImageInfo({
+                        src     : this.userInfo.avatar,
+                        success : res => {
+                            success(res.path)
+                        }
+                    })
+                })
+                
+                // 下载素材
+                let codeImg = new Promise(success => {
+                    uni.getImageInfo({
+                        src     : this.qrcode,
+                        success : res => {
+                            success(res.path)
+                        }
+                    })
+                })
+                    
+                Promise.all([codeImg, avatarImg]).then(res => {
+                    // 绘制海报
+                    const ctx = uni.createCanvasContext('qrcodeCard')
+                    ctx.save()
+                    
+                    // 绘制背景
+                    ctx.setFillStyle('#f7662d')
+                    ctx.fillRect(0, 0, 375, 603)
+                    
+                    // 绘制背景
+                    ctx.drawImage('/static/img/user-codeImg-down.png', 0, 0, 375, 650)
+                    
+                    // 绘制二维码
+                    ctx.drawImage(res[0], 114, 390, 150, 150)
+                    
+                    // 文字
+                    ctx.setFontSize(16)
+                    ctx.setFillStyle("#2f3245")
+                    ctx.setTextAlign('center')
+                    ctx.fillText(this.userInfo.nickname, 194, 350 , 270)
+                    
+                    // 文字
+                    ctx.setFontSize(14)
+                    ctx.setFillStyle("#af7700")
+                    ctx.setTextAlign('center')
+                    ctx.fillText(this.userInfo.nickname + "  --  " + "邀请您进入本时生活", 188, 570 , 270)
+                    
+                    ctx.save();
+                    ctx.beginPath(); //开始绘制
+                    ctx.arc(70 / 2 + 156, 70 / 2 + 250, 70 / 2, 0, Math.PI * 2, false);
+                    ctx.clip();
+                    ctx.drawImage(res[1], 156, 250, 70, 70);
+                    
+                    // 保存图片
+                    ctx.draw(true, () => {
+                        uni.hideLoading()
+                        uni.canvasToTempFilePath({
+                            canvasId: 'qrcodeCard',
+                            x: 0,
+                            y: 0,
+                            success: res => {
+                                this.qrcodeImg = res.tempFilePath
+                                this.removeSaveImg()
+                            }
+                        })
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: '海报下载，请检查网络',
+                        icon : 'none'
+                    })
+                })
+            },
+                    
+            // 图片弹出层
+            removeSaveImg(){
+                this.isImgLay = !this.isImgLay
+            },
+            
+            // 绘制海报
+            saveImg(){
+                this.dowImg();
+            },
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e2e2e2;
+    }
+    
+    /* 按钮 */
+    .codeShare {
+        width: 100%;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #333333;
+        display: flex;
+        padding: 30rpx 20rpx 40rpx;
+        box-sizing: border-box;
+        z-index: 9;
+    }
+    
+    .codeShare-label {
+        width: calc(100% - 80rpx) !important;
+        margin: 30rpx 40rpx;
+        font-weight: normal;
+        text-align: center;
+        height: 86rpx;
+        line-height: 86rpx;
+        padding: 0;
+        border-radius: 60rpx;
+        font-size: 32rpx;
+        color: #ffffff;
+        background: #000000;
+    }
+    
+    .codeShare-button {
+        color: #ffd887;
+        background: transparent;
+    }
+    
+    page {
+        background-color: #e2e2e2;
+    }
+    
+    .content {
+        overflow: hidden;
+    }
+    
+    .codeTitle {
+        width: 100%;
+        background-color: #000000;
+        border-radius: 0 0 200rpx 200rpx;
+        padding: 40rpx 20rpx 160rpx;
+        box-sizing: border-box;
+    }
+    
+    .codeTitle {
+        text-align: center;
+        width: 100%;
+    }
+    
+    .codeCont {
+        background-color: #ffffff;
+        margin: -120rpx auto 0;
+        width: 84%;
+        border-radius: 20rpx;
+        box-shadow: 0 0 20rpx rgba(0, 0, 0, .2);
+        padding: 40rpx 0;
+    }
+    
+    .codeCont-tisp {
+        text-align: center;
+        color: #fff;
+        background-color: #797979;
+        padding: 10rpx 0;
+    }
+    
+    .codeCont-tisp text {
+        display: block;
+    }
+    
+    .codeCont-text {
+        text-align: center;
+        margin: 40rpx 0;
+    }
+    
+    .codeCont-avatar {
+        width: 160rpx;
+        height: 160rpx;
+        border-radius: 50%;
+        margin-bottom: 20rpx;
+    }
+    
+    .codeCont-code {
+        text-align: center;
+    }
+    
+    .codeCont-img {
+        width: 300rpx;
+        height: 300rpx;
+    }
+    
+    .codeCont-title {
+        margin-bottom: 20rpx;
+    }
+    
+    .codeCont-title-text {
+        font-size: 46rpx;
+        font-weight: 700;
+        margin-bottom: 10rpx;
+        letter-spacing: 4rpx;
+    }
+    
+    .codeCont-title-tips {
+        font-size: 28rpx;
+    }
+    
+    /* 弹窗背景图 */
+    .user-lay {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-box-pack: center;
+        position: fixed;
+        background: rgba(0, 0, 0, .6);
+        height: 100vh;
+        width: 100vw;
+        top: 0;
+        left: 0;
+        z-index: 99;
+        box-sizing: border-box;
+    }
+    
+    /* canvas */
+    .canvasImg {
+        position: absolute;
+        left: -1000%;
+        bottom: 0;
+        height: 650px;
+        width: 375px;
+        background: #fbf6f0;
+    }
+    
+    
+    /* 图片弹出层 */
+    .sign-img-lay {
+        text-align: center;
+    }
+    
+    .sign-img-src {
+        width: 70vw;
+        vertical-align: top;
+    }
+    
+    .sign-img-btn {
+        margin: 0 auto 40rpx;
+        background: #ffffff;
+        font-weight: normal;
+        color: #2f3245;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0;
+        width: 80%;
+    }
+    
+    .longpress {
+        width: 40rpx;
+        height: 40rpx;
+        vertical-align: middle;
+        margin-left: 10rpx;
+    }
+    
+    .remove-btn {
+        margin-top: 20rpx;
+        background: #101010;
+        color: #e5c175;
+        font-weight: normal;
+    }
+    
+    /* 背景 */
+    .user-back-img {
+        width: 100%;
+        display: block;
+    }
+    
+    .user-back {
+        position: relative;
+        width: 80%;
+        text-align: center;
+        margin: 0 auto;
+    }
+    
+    .user-back-cont {
+        text-align: center;
+        background-color: #e2e2e2;
+        padding: 40rpx 0;
+    }
+    
+    .user-back-cont image {
+        width: 300rpx;
+        height: 300rpx;
+    }
+    
+    .codeBack-yard-name {
+        margin-bottom: 30rpx;
+    }
+    
+    .codeBack-yard-title {
+        font-size: 50rpx;
+        font-weight: 600;
+        letter-spacing: 4rpx;
+        margin-bottom: 20rpx;
+    }
+</style>
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
new file mode 100644
index 0000000..ef3fc45
--- /dev/null
+++ b/pages/coupon/coupon.vue
@@ -0,0 +1,322 @@
+<template>
+    <view>
+        <!-- 我的卡券 -->
+        <view class="couponTab">
+        	<view class="couponTab-label" :class="{active : label.stateType == item.used}" v-for="(item,index) in label.couponLabel" :key="index" @click="orderTab(item.used)">
+        		{{ item.title }}
+        		<view v-if="item.used == 0">({{ couponData.count.init }}张)</view>
+        		<view v-else-if="item.used == 1">({{ couponData.count.used }}张)</view>
+        		<view v-else>({{ couponData.count.pass }}张)</view>
+        	</view>
+        </view>
+        
+        <!-- 卡券列表 -->
+        <view class="coupon" v-if="couponData.couponArr != ''">
+        	<view class="couponCont" :class="{active : item.status != 0}" v-for="(item,index) in couponData.couponArr" :key="index">
+        		<view class="couponList" @click="couponUrl(item.coupon_id, item.from, item.status)">
+        			<view class="couponList-left">
+        				<image class="couponList-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_img.png"></image>
+        
+        				<!-- 优惠券 -->
+        				<view class="couponList-icon" v-if="item.type == 'physical'">
+        					<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_icon_01.png"></image>
+        				</view>
+        
+        				<!-- 实物 -->
+        				<view class="couponList-icon" v-else>
+        					<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_icon_00.png"></image>
+        				</view>
+        			</view>
+        			<view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+        				<view class="nowrap couponList-title">{{ item.name }}</view>
+        				<view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+        				<view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{ item.activity_name }}</view>
+        				<view class="couponList-used" v-if="item.used_at != ''">使用时间：{{ item.used_at }}</view>
+        			</view>
+        			<block v-if="item.status == 0">
+        				<view class="couponList-right">
+        					去使用
+        				</view>
+        			</block>
+        			<image v-if="item.status == 1" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips_00.png" class="coupoTips"></image>
+        			<image v-if="item.status == 2" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips_01.png" class="coupoTips"></image>
+        		</view>
+        		<view class="couponMore" v-if="item.count > 1">
+        			<view class="couponMore-text" @click="couponTap(item.activityId, item.status)">
+        				<view class="couponMore-title">查看全部{{item.count}}张卡券</view>
+        				<image class="couponMore-arrow" src="/static/icon/arrow_left.png"></image>
+        			</view>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+        	<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips.png"></image>
+        	<view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { coupon, washcarCoupon } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                label : {
+                   stateType   : '0', // 卡券状态
+                   couponLabel : [
+                        { title : "未使用", used: 0 },
+                        { title : "已使用", used: 1 },
+                        { title : "已过期", used: 2 }
+                    ]
+                },
+                couponData: {
+                    couponArr   : '',   // 卡券列表
+                    coupons     : [],
+                    count       : '',   // 卡券数量
+                }
+            }
+        },
+        onLoad(options) {
+            
+        },
+        onShow () {
+            // 获取卡券列表
+            this.couponInfo();
+        },
+        methods:{
+            // 卡券列表
+            couponInfo() {
+                coupon(this.label.stateType).then(res=>{
+                    this.couponData.count     = res.count
+                    this.couponData.couponArr = res.list
+                })
+            },
+            
+            // 卡券tabs
+            orderTab(used){
+                if(this.label.stateType != used){
+                    this.label.stateType = used
+                    // 获取卡权益
+                    this.couponInfo()
+                }
+            },
+            
+            // 跳转优惠券分组
+            couponTap(id, status) {
+                uni.navigateTo({
+                  url: '/pages/couponArr/couponArr?id=' + id + '&status=' + status
+                })
+            },
+            
+            // 优惠券跳转
+            couponUrl(newId, newFrom, newStatus) {
+                if(newStatus == 0) {
+                    if(newFrom == 'washcar') {
+                        washcarCoupon(newId).then(res=>{
+                            const newUrl = res.data
+                            let url= encodeURIComponent(newUrl)
+                            uni.redirectTo({
+                                // 跳转到webview页面
+                                url: `/pages/washcar/washcar?url=${url}`
+                            });
+                        }).catch(err=>{
+                            if(!err.login){
+                                // 写入缓存
+                                uni.setStorage({
+                                    key     : 'token',
+                                    data    : ''
+                                })
+                            }
+                        })
+                        return
+                    }
+                    uni.navigateTo({
+                        url: '/pages/couponDetails/couponDetails?id=' + newId
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 优惠券tab
+    .couponTab {
+        display: flex;
+        background: #fff;
+        position: fixed;
+        width: 100%;
+        left: 0;
+        height: 100rpx;
+        top: 0;
+        z-index: 99;
+        .couponTab-label {
+            flex: 3;
+            text-align: center;
+            position: relative;
+            padding: 10rpx 0 0;
+            font-size: 26rpx;
+            &::after {
+                position: absolute;
+                content: '';
+                left: calc(50% - 20rpx);
+                bottom: 0;
+                width: 40rpx;
+                background: transparent;
+                height: 6rpx;
+                border-radius: 30%;
+            }
+            &.active {
+                color: #f57e32;
+            }
+            view {
+                font-size: 24rpx;
+                margin-top: 6rpx;
+            }
+        }
+    }
+    // 卡券列表
+    .coupon {
+        margin-top: 70px;
+        .couponCont {
+            margin: 0 20rpx 20rpx;
+            width: calc(100% - 40rpx);
+            border-radius: 10rpx;
+            overflow: hidden;
+            .couponList {
+                background: #fff;
+                width: 100%;
+                height: 160rpx;
+                position: relative;
+                .couponList-left {
+                    position: relative;
+                    left: 0;
+                    top: 0;
+                    width: 160rpx;
+                    height: 160rpx;
+                    .couponList-img {
+                        position: absolute;
+                        left: 0;
+                        top: 0;
+                        width: 100%;
+                        height: 100%;
+                        z-index: 1;
+                    }
+                    .couponList-icon {
+                        position: absolute;
+                        left: calc(50% - 56rpx);
+                        top: calc(50% - 50rpx);
+                        z-index: 2;
+                        width: 100rpx;
+                        height: 100rpx;
+                        background: #fff;
+                        border-radius: 50%;
+                        padding: 20rpx;
+                        box-sizing: border-box;
+                        image {
+                            width: 100%;
+                            height: 100%;
+                        }
+                    }
+                }
+                .couponList-center {
+                    position: absolute;
+                    left: 180rpx;
+                    top: 18rpx;
+                    width: calc(100% - 330rpx);
+                    .couponList-title {
+                        margin-bottom: 10rpx;
+                        font-size: 28rpx;
+                        font-weight: 600;
+                    }
+                    .couponList-time,
+                    .couponList-used {
+                        font-size: 24rpx;
+                        color: grey;
+                    }
+                    .couponList-used {
+                        margin-top: 14rpx;
+                        color: grey;
+                    }
+                }
+                .couponList-right {
+                    background: #ee8e44;
+                    color: #fff;
+                    border-radius: 30rpx;
+                    width: 110rpx;
+                    text-align: center;
+                    height: 50rpx;
+                    line-height: 50rpx;
+                    position: absolute;
+                    right: 20rpx;
+                    top: 55rpx;
+                    font-size: 24rpx;
+                    &.active {
+                        background: #dddddd;
+                    }
+                }
+            }
+            .couponMore {
+                font-size: 28rpx;
+                color: #686868;
+                position: relative;
+                height: 120rpx;
+                &::after,
+                &::before {
+                    position: absolute;
+                    content: '';
+                    height: 20rpx;
+                    border-radius: 10rpx;
+                    background: #fff;
+                    box-shadow: 0 0 20rpx rgba(0, 0, 0, .1);
+                    z-index: 1;
+                    height: 30rpx;
+                }
+                &::after {
+                    width: calc(100% - 40rpx);
+                    top: 70rpx;
+                    left: 20rpx;
+                }
+                &::before {
+                    width: calc(100% - 80rpx);
+                    top: 90rpx;
+                    left: 40rpx;
+                }
+                .couponMore-text {
+                    display: flex;
+                    position: absolute;
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    z-index: 99;
+                    height: 80rpx;
+                    border-radius: 0 0 10rpx 10rpx;
+                    line-height: 80rpx;
+                    padding: 0 30rpx;
+                    box-sizing: border-box;
+                    background: #fff;
+                    box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+                    .couponMore-title {
+                        flex: 1;
+                    }
+                    .couponMore-arrow {
+                        width: 28rpx;
+                        height: 28rpx;
+                        margin-top: 26rpx;
+                    }
+                }
+            }
+            &.active .couponList-img,
+            &.active .couponList-icon {
+                -webkit-filter: grayscale(100%);
+                -moz-filter: grayscale(100%);
+                -ms-filter: grayscale(100%);
+                -o-filter: grayscale(100%);
+                filter: grayscale(100%);
+                filter: gray;
+            }
+        }
+    }
+</style>
diff --git a/pages/couponArr/couponArr.vue b/pages/couponArr/couponArr.vue
new file mode 100644
index 0000000..d13a87f
--- /dev/null
+++ b/pages/couponArr/couponArr.vue
@@ -0,0 +1,202 @@
+<template>
+    <view>
+        <!-- 卡券列表 -->
+        <view class="coupon" v-if="couponArr.length > 0">
+        	<view class="couponCont" :class="{active : item.status != 0}" v-for="(item,index) in couponArr" :key="index" @click="couponUrl(item.id, item.from, item.status)">
+        		<view class="couponList">
+        			<view class="couponList-left">
+        				<image class="couponList-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_img.png"></image>
+        
+        				<!-- 优惠券 -->
+        				<view class="couponList-icon" v-if="item.type == 'physical'">
+        					<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_icon_01.png"></image>
+        				</view>
+        
+        				<!-- 实物 -->
+        				<view class="couponList-icon" v-else>
+        					<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_icon_00.png"></image>
+        				</view>
+        			</view>
+        			<view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+        				<view class="nowrap couponList-title">{{ item.name }}</view>
+        				<view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+        				<view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{ item.activity_name }}</view>
+        				<view class="couponList-used" v-if="item.used_at != ''">使用时间：{{ item.used_at }}</view>
+        			</view>
+        			<block v-if="item.status == 0">
+        				<view class="couponList-right">
+        					去使用
+        				</view>
+        			</block>
+        			<image v-if="item.status == 1" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips_00.png" class="coupoTips"></image>
+        			<image v-if="item.status == 2" src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips_01.png" class="coupoTips"></image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+        	<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/coupon_tips.png"></image>
+        	<view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { couponArr } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                couponId    : '',      // 卡券id
+                couponArr   : [],      // 卡券列表
+                status      : '',      // 卡券状态
+                load:       {
+                    page    : 1,       // 第一页
+                    allpage : 0,       // 总页数
+                    has_more: false,   // 是否有分页
+                    show    : false    // 是否有下一页数据
+                },
+                finished    : false,   // 商品列表没有更多商品是否显示
+                LoadData    : false    // 数据加载完渲染
+            }
+        },
+        onLoad(options) {
+            this.couponId = options.id,
+            this.status   = options.status
+            
+            // 获取卡券组列表
+            this.couponInfo();
+        },
+        methods:{
+            // 卡券组列表
+            couponInfo() {
+                if (this.load.page == 1) {
+                    this.couponArr = [];
+                }
+                couponArr({
+                    activityId: this.couponId,
+                    status    : this.status,
+                    page      : this.load.page
+                }).then(res=>{
+                    this.couponArr      = this.couponArr.concat(res.data)
+                    this.load.allpage   = res.page.total_page
+                    this.load.has_more  = res.page.has_more
+                    // 数据渲染加载
+                    this.LoadData = true
+                })
+            },
+            
+            // 优惠券跳转
+            couponUrl(newId, newFrom, newStatus) {
+                if(newStatus == 0) {
+                    if(newFrom == 'washcar') {
+                        washcarCoupon(newId).then(res=>{
+                            const newUrl = res.data
+                            let url= encodeURIComponent(newUrl)
+                            uni.redirectTo({
+                                // 跳转到webview页面
+                                url: `/pages/washcar/washcar?url=${url}`
+                            });
+                        }).catch(err=>{
+                            if(!err.login){
+                                // 写入缓存
+                                uni.setStorage({
+                                    key     : 'token',
+                                    data    : ''
+                                })
+                            }
+                        })
+                        return
+                    }
+                    uni.navigateTo({
+                        url: '/pages/couponDetails/couponDetails?id=' + newId
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 卡券列表
+    .coupon {
+        padding: 20rpx 0;
+        .couponCont {
+            margin: 0 20rpx 20rpx;
+            width: calc(100% - 40rpx);
+            border-radius: 10rpx;
+            overflow: hidden;
+            .couponList {
+                background: #fff;
+                width: 100%;
+                height: 160rpx;
+                position: relative;
+                .couponList-left {
+                    position: relative;
+                    left: 0;
+                    top: 0;
+                    width: 160rpx;
+                    height: 160rpx;
+                    .couponList-img {
+                        position: absolute;
+                        left: 0;
+                        top: 0;
+                        width: 100%;
+                        height: 100%;
+                        z-index: 1;
+                    }
+                    .couponList-icon {
+                        position: absolute;
+                        left: calc(50% - 56rpx);
+                        top: calc(50% - 50rpx);
+                        z-index: 2;
+                        width: 100rpx;
+                        height: 100rpx;
+                        background: #fff;
+                        border-radius:50%;
+                        padding: 20rpx;
+                        box-sizing: border-box;
+                        image {
+                            width: 100%;
+                            height: 100%;
+                        }
+                    }
+                }
+                .couponList-center {
+                    position: absolute;
+                    left: 180rpx;
+                    top: 16rpx;
+                    width: calc(100% - 330rpx);
+                    .active {
+                        top: 15rpx;
+                    }
+                    .couponList-title {
+                        margin-bottom: 10rpx;
+                        font-size: 28rpx;
+                        font-weight: 600;
+                    }
+                    .couponList-time, .couponList-used {
+                        font-size: 24rpx;
+                        color: grey;
+                    }
+                    .couponList-used {
+                        margin-top: 14rpx;
+                    }
+                }
+                .couponList-right {
+                    background: #ee8e44;
+                    color: #fff;
+                    border-radius: 30rpx;
+                    width: 110rpx;
+                    text-align: center;
+                    height: 50rpx;
+                    line-height: 50rpx;
+                    position: absolute;
+                    right: 20rpx;
+                    top: 55rpx;
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/couponDetails/couponDetails.vue b/pages/couponDetails/couponDetails.vue
new file mode 100644
index 0000000..f241f18
--- /dev/null
+++ b/pages/couponDetails/couponDetails.vue
@@ -0,0 +1,387 @@
+<template>
+    <view>
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ coupon.details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ coupon.details.startTime }} - {{ coupon.details.endTime }}
+        		</view>
+        	</view>
+        	<view class="source">活动来源 ： {{ coupon.details.activity_name }}</view>
+        	<view class="detailsBar">
+        		<view class="detailsCode-text">劵码</view>
+        		<image :src="code.barcode" mode="widthFix"></image>
+        	</view>
+        	<view class="detailsCode-text">
+        		{{ coupon.details.code }}
+        	</view>
+        	<view class="detailsCode">
+        		<image :src="code.qrcode"></image>
+        		<view class="detailsCode-text">
+        			<text>请出示以上券码给网点工作人员</text>
+        		</view>
+        	</view>
+        
+        	<!-- 门店定位 -->
+        	<view class="detailsStore">
+        		<view class="detailsStore-top">
+        			<view class="detailsStore-title">
+        				适用门店
+        			</view>
+        			<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + coupon.details.id" v-if="location.longitude != 0 && location.latitude != 0">
+        				查看所有
+        				<image src="/static/icon/arrow_left.png"></image>
+        			</navigator>
+        		</view>
+        		<view class="location" v-if="location.longitude == 0 && location.latitude == 0">
+        			<image class="location-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/location_img.jpg"></image>
+        			<text>您尚未授权本时生活开启定位服务</text>
+        			<text>不能看到附近的商家哦，点击下方按钮开启</text>
+        			<button class="location-btn" size="mini" open-type="openSetting">
+        				开启定位服务
+        			</button>
+        		</view>
+        		<view v-else>
+        			<block v-if="coupon.stores != ''">
+        				<view class="detailsStore-list" v-for="(item,index) in coupon.stores" :key="index"
+        					@click="detailsTap(item.store_id)">
+        					<image :src="item.cover" class="detailsStore-logo"></image>
+        					<view class="detailsStore-cont">
+        						<view class="detailsStore-left">
+        							<view class="nowrap detailsStore-name">
+        								{{ item.title }}
+        							</view>
+        							<view class="detailsStore-place">
+        								<text class="nowrap">{{ item.address }}</text>
+        								{{ item.km }}
+        							</view>
+        						</view>
+        						<image class="detailsStore-tel" src="/static/icon/tel.png" @click.stop="tel(item.mobile)"></image>
+        					</view>
+        				</view>
+        			</block>
+        			<block v-else>
+        				<view class="pages-hint">
+        					<image src="/static/img/null_icon.png"></image>
+        					<view>暂无门店</view>
+        				</view>
+        			</block>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 使用须知 -->
+        <view class="detailsText">
+        	<view class="detailsText-title">
+        		使用须知
+        	</view>
+        	<view class="detailsText-tips">
+        		<rich-text :nodes="coupon.remark"></rich-text>
+        	</view>
+        </view>
+        
+        
+        <!-- 内容介绍 -->
+        <view class="detailsText">
+        	<view class="detailsText-title">
+        		内容介绍
+        	</view>
+        	<view class="detailsText-tips" v-if="coupon.content != null">
+        		<rich-text :nodes="coupon.content"></rich-text>
+        	</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { couponinfo, merchant_card, qrcode, barcode } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                coupon       : {
+                    couponId : '',  // 优惠券id
+                    details  : '',  // 优惠券信息
+                    stores   : [],  // 商家列表
+                    remark   : '',  // 使用须知
+                    content  : '',  // 内容介绍
+                },
+                code         : {
+                    qrcode   : '', //二维码
+                    barcode  : '', //条形码
+                },
+                location     : {
+                    latitude : 126.66837,  // 纬度
+                    longitude: 45.76021   // 经度
+                }
+            }
+        },
+        onLoad(options) {
+            this.coupon.couponId = options.id
+            
+            // 获取二维码
+            this.detailsCode()
+            
+            // 获取条形码
+            this.detailsBarcode()
+        },
+        onShow () {
+            // 查看定位信息
+            this.getCity();
+        },
+        methods:{
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.coupon.couponId,
+                    user_lng : this.location.longitude,
+                    user_lat : this.location.latitude
+                }).then(res=>{
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.coupon.details = res.info
+                    this.coupon.stores  = stores
+                    this.coupon.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.coupon.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                })
+            },
+            
+            // 获取城市信息
+            getCity(){
+                uni.getLocation({
+                    success: res => {
+                        this.location.latitude   = res.latitude,
+                        this.location.longitude  = res.longitude
+                    },
+                    complete: (err) => {
+                        // 获取详情信息
+                        this.detailsInfo();
+                    }
+                })
+            },
+            
+            // 二维码
+            detailsCode() {
+                qrcode(this.coupon.couponId).then(res=>{
+                    this.code.qrcode = res.qrcode
+                })
+            },
+            
+            // 条形码
+            detailsBarcode() {
+                barcode(this.coupon.couponId).then(res=>{
+                    this.code.barcode = res.barcode
+                })
+            },
+            
+            // 拨打电话
+            tel(number) {
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: number
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(id) {
+                uni.navigateTo({
+                  url: '/pages/store/details?store_id=' + id + '&user_lng=' +  this.location.longitude  + '&user_lat=' + this.location.latitude,
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 卡券详情 */
+    .details {
+        background: #fff;
+        margin: 20rpx;
+        width: calc(100% - 40rpx);
+        border-radius: 20rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+        box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+        .detailsTop {
+            border-bottom: 2rpx dashed #c8c8c8;
+            padding-bottom: 40rpx;
+            .detailsTop-name {
+                font-size: 36rpx;
+                font-weight: 600;
+                margin-bottom: 20rpx;
+            }
+            .detailsTop-time {
+                color: #7e7e7e;
+                font-size: 26rpx;
+            }
+        }
+        .source{ 
+            margin: 30rpx 0;
+            font-size: 28rpx;
+        }
+        .detailsBar {
+            text-align: center;
+            padding: 0 50rpx;
+            box-sizing: border-box;
+            margin-top: 60rpx;
+            margin-bottom: 40rpx;
+            image {
+                width: 100%;
+            }
+            .detailsCode-text {
+                margin-bottom: 10px;
+                color: #000;
+            }
+        }
+        .detailsCode-text {
+            text-align: center;
+            font-size: 32rpx;
+            font-weight: 600;
+            color: #000;
+            text {
+                color: #999;
+                font-weight: normal;
+                font-size: 26rpx;
+            }
+        }
+        .detailsCode {
+            text-align: center;
+            padding: 0 0 20rpx;
+            margin: 40rpx 0 30rpx;
+            image {
+                width: 300rpx;
+                height: 300rpx;
+                margin-bottom: 30rpx;
+            }
+        }
+        .detailsStore {
+            border-top: 2rpx #c8c8c8 solid;
+            padding-top: 40rpx;
+            .detailsStore-top {
+                display: flex;
+                line-height: 30rpx;
+                margin-bottom: 20rpx;
+                .detailsStore-title {
+                    flex: 1;
+                    font-weight: 600;
+                }
+            }
+            .location {
+                background: white;
+                width: 100%;
+                text-align: center;
+                margin: 60rpx 0 0;
+                text {
+                    font-size: 28rpx;
+                    display: block;
+                    line-height: 46rpx;
+                    color: #999;
+                }
+                .location-img {
+                    width: 150rpx;
+                    height: 120rpx;
+                    margin-bottom: 20rpx;
+                }
+                .location-btn[size="mini"] {
+                    background-color: #ee8e44;
+                    color: #fff;
+                    font-size: 26rpx;
+                    line-height: 66rpx;
+                    margin-top: 30rpx;
+                }
+            }
+        }
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 20rpx;
+        box-sizing: border-box;
+        .detailsText-title {
+            font-size: 32rpx;
+            font-weight: 600;
+            margin-bottom: 20rpx;
+        }
+        .detailsText-tips {
+            font-size: 26rpx;
+            line-height: 50rpx;
+            color: #555557;
+            padding-bottom: 20rpx;
+        }
+    }
+    
+    // 门店
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+        .detailsStore-logo {
+            width: 100rpx;
+            height: 100rpx;
+            border-radius: 10rpx;
+        }
+        .detailsStore-cont {
+            position: absolute;
+            left: 130rpx;
+            top: 0;
+            width: calc(100% - 130rpx);
+            display: flex;
+            .detailsStore-left {
+                width: calc(100% - 90rpx);
+                margin-right: 30rpx;
+                .detailsStore-name {
+                    margin-bottom: 20rpx;
+                }
+                .detailsStore-place {
+                    font-size: 24rpx;
+                    line-height: 40rpx;
+                    color: #5a5a5a;
+                    display: flex;
+                    text {
+                        flex: 1;
+                        display: inline-block;
+                        font-size: 28rpx;
+                        margin-right: 20rpx;
+                    }
+                }
+            }
+            .detailsStore-tel {
+                width: 60rpx;
+                height: 60rpx;
+                margin-top: 25rpx;
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/choose.vue b/pages/draw/choose.vue
new file mode 100644
index 0000000..ae347d5
--- /dev/null
+++ b/pages/draw/choose.vue
@@ -0,0 +1,515 @@
+<template>
+    <view class="content">
+        <view class="borderBottom">
+            <view class="title">
+                <image class="title-img" src="/static/img/draw_choose.png"></image>
+                <view class="title-top">
+                    选择商品兑换
+                </view>
+            </view>
+            <view class="choose">
+                <view class="choose-radio-group">
+                    <radio-group class="choose-label" :class="{active : current == 1}" @change="(e) => radioChange(e,index,item)" v-for="(item, index) in goodsArr" :key="index">
+                        <view class="choose-label-name">
+                            <image class="choose-label-img" :src="item.cover"></image>
+                            <view class="choose-label-text">
+                                <view class="choose-label-title">
+                                    {{item.title}}
+                                    <text>基于能监测健康的手环</text>
+                                </view>
+                                <view class="choose-label-price">
+                                    <text>￥</text>{{item.price}}
+                                </view>
+                            </view>
+                        </view>
+                        <radio class="radio" :value="String(item.exchagne_item_goods_id)" :checked="index == current"></radio>
+                    </radio-group>
+                </view>
+                <view class="chooseForm">
+                    <view class="site-input">
+                        <label>收货人姓名</label>
+                        <input class="campus-form-input" maxlength="4" type="text" placeholder="请输入收货人姓名" @input="getNameValue" name="name" placeholder-style="color:#c9c9c9;"></input>
+                    </view>
+                    <view class="site-input">
+                        <label>收货人手机</label>
+                        <input class="campus-form-input" maxlength="11" type="number" placeholder="请输入收货人手机号" @input="getTelValue" name="mobile" placeholder-style="color:#c9c9c9;"></input>
+                    </view>
+                    <!-- <view class="site-input">
+                        <label>所在省份</label>
+                        <picker @change="areasChange" :value="area.areaIndex" :range="area.areas" :range-key="'name'" name="province_id">
+                            <view class="picker" v-if="area.areas[area.areaIndex]">
+                                {{ area.areas[area.areaIndex].name }}
+                            </view>
+                    		<image src="/static/icon/rightsArrow.png"></image>
+                        </picker>
+                    </view>
+                    <view class="site-input">
+                        <label>所在城市</label>
+                        <picker @change="cityDrop" :value="city.cityIndex" :range="city.cityList" :range-key="'name'" class="conneColor" name="city_id">
+                            <view class="picker" v-if="city.cityList[city.cityIndex]">
+                                {{ city.cityList[city.cityIndex].name }}
+                            </view>
+                    		<image src="/static/icon/rightsArrow.png"></image>
+                        </picker>
+                    </view>
+                    <view class="site-input">
+                        <label>所在区域</label>
+                        <picker @change="regiDrop" :value="regi.regiIndex" :range="regi.regiList" :range-key="'name'" class="conneColor" name="district_id">
+                            <view class="picker" v-if="regi.regiList[regi.regiIndex]">
+                                {{ regi.regiList[regi.regiIndex].name }}
+                            </view>
+                    		<image src="/static/icon/rightsArrow.png"></image>
+                        </picker>
+                    </view> -->
+                    <view class="site-input">
+                    	<label>收货地址</label>
+                    	<input placeholder="请输入收货详细地址" name="address" @input="getAddressValue" placeholder-style="color:#c9c9c9;"></input>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="chooseBuy">
+            <view class="chooseBuy-price">
+                {{goodTitle}}<text>{{goodPay == 0 ? '免费兑换' : '支付金额： ￥' + goodPrice}}</text>
+            </view>
+            <button type="default" class="chooseBuy-btn" @click="siteform">
+                兑换
+            </button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { exchanges, exchangesBuy } from '@/apis/interfaces/draw'
+    import { create, children } from '@/apis/interfaces/address'
+    import { getAuthUrl, wpayH5Info, h5Pay } from '@/apis/interfaces/rights'
+    const jweixin = require('jweixin-module');  //获取微信支付
+    export default {
+        data() {
+            return {
+                logId      : '', //抽奖记录
+                tradeNo    : '', //产品支付订单号
+                goodsArr   : [], //产品列表
+                goodId     : '', //产品id
+                goodTitle  : '', //产品名称
+                goodPrice  : '', //产品金额
+                goodPay    : '', //产品是否支付
+                current    : 0 , //支付下标
+                address    : '', // 地址内容
+                name       : '', // 姓名
+                mobile     : '', // 手机号
+                // 省份选择
+                area: { 
+                    areas      : [],
+                    areaSn     : '',
+                    areaIndex  : 0,
+                },
+                        
+                // 市级选择
+                city: {
+                    cityList   : [],
+                    cityId     : 0,
+                    cityIndex  : 0,
+                },
+                        
+                // 区域选择
+                regi: {
+                    regiList   : [],
+                    regiId     : 0,
+                    regiIndex  : 0,
+                }
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 判断是否微信授权登录过  只有外部游览器才用到（支付需要授权微信环境）
+            let status = navigator.userAgent.toLowerCase();
+            if (status.match(/MicroMessenger/i) == "micromessenger" && !options.code) {
+                let locationUrl = window.location.pathname.substr(1) + window.location.search
+                getAuthUrl(locationUrl).then(res=> {
+                    window.location.href = res
+                })
+            }
+            this.openid  = options.openid || ''
+            this.code    = options.code || ''  //用code换取oppid
+            
+            // 获取商品选择
+            this.exchangesShow(options.id)
+        },
+        
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 获取省信息
+            // this.getProvince()
+        },
+		
+        methods: {
+            // 微信支付数据
+            wechatPayment() {
+                let status = navigator.userAgent.toLowerCase();
+                if (status.match(/MicroMessenger/i) == "micromessenger") {
+                    // 微信浏览器-获取
+                    this.wxBrowser();
+                }else {
+                    // 普通浏览器(网址游览器)
+                    this.outBrowser();
+                }
+            },
+            
+            // 商品选择
+            exchangesShow(id){
+                exchanges(id).then(res=>{
+                    this.logId     = res.exchage_log_id
+                    this.goodsArr  = res.exchange_item.goods
+                    this.goodId    = res.exchange_item.goods[0].exchagne_item_goods_id
+                    this.goodTitle = res.exchange_item.goods[0].title
+                    this.goodPrice = res.exchange_item.goods[0].price
+                    this.goodPay   = res.exchange_item.goods[0].is_buy
+                })
+            },
+            
+			// 支付方式选择
+			radioChange(evt, index, item) {
+                this.goodTitle = item.title
+                this.goodPay   = item.is_buy
+                this.goodPrice = item.amount
+                this.current   = index
+                this.goodId    = evt.detail.value
+			},
+            
+            // 省信息
+            getProvince() {
+                create().then(res=>{
+                    let areaArr    =  res.provinces,
+                        areaIndex  =  this.area.areaIndex
+                    this.area.areaSn   = areaArr[areaIndex].code
+                    this.area.areas    = areaArr
+                    this.citylist(areaArr[areaIndex].code)
+                })
+            },
+            
+            // 所在省份
+            areasChange(e) {
+                let area     = this.area.areas,
+                    index    = e.detail.value,
+                    atcode   = area[index].code
+                if (index != this.area.areaIndex) {
+                    this.area.areaIndex  = index
+                    this.area.areaSn     = atcode
+                    
+                    // 获取市级列表
+                    this.citylist(atcode)
+                }
+            },
+            
+            // 市级列表
+            citylist(code) {
+                children(code).then(res=>{
+                    let cityArr = res
+                    this.city.cityId    = cityArr[0].code
+                    this.city.cityList  = cityArr
+                    this.city.cityIndex = 0
+                    this.regilist(cityArr[0].code)
+                })
+            },
+            
+            // 市级下拉筛选
+            cityDrop(e) {
+                let city     = this.city.cityList,
+                    index    = e.detail.value,
+                    citycode = city[index].code
+                if (index != this.area.areaIndex) {
+                    this.city.cityIndex = index
+                    this.city.cityId    = citycode
+                    
+                    // 获取市级列表
+                    this.regilist(citycode)
+                }
+            },
+            
+            // 区列表
+            regilist(areaCode) {
+                children(areaCode).then(res=>{
+                    this.regi.regiList  = res
+                    this.regi.regiId    = res[0].code
+                    this.regi.regiIndex = 0
+                })
+            },
+            
+            // 区下拉筛选
+            regiDrop(e) {
+                let newIndex = e.detail.value
+                this.regi.regiIndex  = newIndex
+                this.regi.regiId     = this.regi.regiList[newIndex].code
+            },
+            
+            // 获取用户名
+            getNameValue(e) {
+                this.name = e.detail.value
+            },
+            
+            // 获取手机号
+            getTelValue(e) {
+                this.mobile = e.detail.value
+            },
+            
+            // 获取详细地址
+            getAddressValue(e) {
+                this.address = e.detail.value
+            },
+            
+            // 提交表单
+            siteform() {
+                exchangesBuy({
+                    name        : this.name,
+                    mobile      : this.mobile,
+                    address     : this.address,
+                    activity_exchange_log_id: this.logId,
+                    activity_exchange_item_goods_id: this.goodId,
+                    qty         : 1
+                }).then(res=>{
+                    if(res.need_buy) {
+                        this.tradeNo = res.trade_no
+                        this.wxBrowser()
+                        return
+                    }
+                    // 跳转兑换成功页
+                    uni.redirectTo({
+                        url: 'success'
+                    })
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                })
+            },
+            
+            // 当支付环境为微信游览器情况下
+            wxBrowser() {
+                wpayH5Info({
+                    url: location.href.split('#')[0],
+                    list:'chooseWXPay'
+                }).then(wechatConfig => {
+                    let wxConfig = JSON.parse(wechatConfig)
+                    jweixin.config({
+                        appId: wxConfig.appId,
+                        debug: false,
+                        jsApiList: wxConfig.jsApiList,
+                        signature: wxConfig.signature,
+                        nonceStr: wxConfig.nonceStr,
+                        timestamp: wxConfig.timestamp
+                    })
+                    jweixin.ready(() => {
+                        let wechaUrl = 'payments/wechat'
+                        h5Pay(wechaUrl, {
+                            channel: 'h5',
+                            trade_no: this.tradeNo,
+                            code: this.code
+                        }).then(wechatRes => {
+                            let wechatPay = JSON.parse(wechatRes)
+                            console.log("wechatPay")
+                            jweixin.chooseWXPay({
+                                timestamp: wechatPay.timeStamp,
+                                nonceStr: wechatPay.nonceStr, 
+                                package: wechatPay.package,
+                                signType: wechatPay.signType,
+                                paySign: wechatPay.paySign,
+                                success: payRes => {
+                                    console.log(payRes)
+                                },
+                                cancel: () =>{
+                                }
+                            })
+                        })
+                    })
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                    if (!err.login) {
+                        uni.reLaunch({
+                            url: '/pages/draw/signin'
+                        });
+                    }
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+    .content {
+        padding: 30rpx 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .borderBottom {
+        border-bottom: 110rpx solid transparent;
+    }
+    
+    .title {
+        position: relative;
+        width: 100%;
+        background-color: #2564ff;
+        height: 100rpx;
+        border-radius: 10rpx;
+        .title-img {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            height: 100rpx;
+            left: 0;
+            top: 0;
+        }
+        .title-top {
+            width: 100%;
+            height: 100%;
+            line-height: 100rpx;
+            position: absolute;
+            left: 0;
+            top: 0;
+            z-index: 9;
+            text-align: center;
+            font-size: 32rpx;
+            font-weight: 600;
+            color: #FFFFFF;
+        }
+    }
+    
+    .choose {
+        margin: 30rpx -10rpx 0;
+        overflow: hidden;
+        .choose-radio-group {
+            overflow: hidden;
+        }
+        .choose-label {
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx;
+            border-radius: 10rpx;
+            background-color: #FFFFFF;
+            margin-bottom: 30rpx;
+            padding: 30rpx 20rpx;
+            box-sizing: border-box;
+            position: relative;
+            .choose-label-name {
+                .choose-label-img {
+                    width: 100rpx;
+                    height: 100rpx;
+                }
+            }
+            .radio {
+                position: absolute;
+                top: 20rpx;
+                right: 10rpx;
+            }
+            .choose-label-text {
+                margin-top: 20rpx;
+                font-weight: 600;
+                .choose-label-title {
+                    margin-bottom: 30rpx;
+                    font-size: 30rpx;
+                    text {
+                        font-weight: normal;
+                        color: #bac0d7;
+                        display: block;
+                        font-size: 26rpx;
+                        line-height: 54rpx;
+                    }
+                }
+                .choose-label-price {
+                    color: #fd7164;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 26rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    .chooseBuy {
+        position: fixed;
+        width: 100%;
+        height: 110rpx;
+        left: 0;
+        bottom: 0;
+        display: flex;
+        background-color: #FFFFFF;
+        padding: 30rpx;
+        box-sizing: border-box;
+        .chooseBuy-btn {
+            position: absolute;
+            right: 20rpx;
+            top: 26rpx;
+            background-color: #f24b44;
+            color: #FFFFFF;
+            height: 62rpx;
+            line-height: 60rpx;
+            margin: 0;
+            font-size: 28rpx;
+            padding: 0 35rpx;
+        }
+        .chooseBuy-name {
+            font-size: 32rpx;
+            line-height: 48rpx;
+        }
+        .chooseBuy-price {
+            font-size: 28rpx;
+            line-height: 50rpx;
+            color: #777b85;
+            text {
+                color: #f14646;
+                padding-left: 20rpx;
+            }
+        }
+    }
+    
+    .chooseForm {
+        background-color: #FFFFFF;
+        margin: 0 15rpx;
+        border-radius: 10rpx;
+        .site-input {
+            font-size: 30rpx;
+            padding: 0 30rpx 0 220rpx;
+            box-sizing: border-box;
+            position: relative;
+            line-height: 100rpx;
+            min-height: 100rpx;
+            &::before {
+                position: absolute;
+                bottom: 0;
+                width: 100%;
+                left: 0rpx;
+                right: 0;
+                height: 1rpx;
+                content: "";
+                background: #e4e6f2;
+            }
+            &:last-child::before {
+                display: none;
+            }
+            label {
+                position: absolute;
+                left: 30rpx;
+                top: 0;
+            }
+            input {
+                font-size: 30rpx;
+                height: 110rpx;
+            }
+            image {
+                width: 38rpx;
+                height: 38rpx;
+                position: absolute;
+                right: 20rpx;
+                top: 32rpx;
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/couponDetails.vue b/pages/draw/couponDetails.vue
new file mode 100644
index 0000000..db511d2
--- /dev/null
+++ b/pages/draw/couponDetails.vue
@@ -0,0 +1,546 @@
+<template>
+    <view>
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ details.startTime }} - {{ details.endTime }}
+        		</view>
+        	</view>
+        	<view class="detailsCotent">
+        	    <view class="source">活动来源 ： {{ details.activity_name }}</view>
+        	    <view class="detailsBar">
+        	    	<view class="detailsCode-text">劵码</view>
+        	    	<image :src="barcode" mode="widthFix"></image>
+        	    </view>
+        	    <view class="detailsCode-text">
+        	    	{{ details.code }}
+        	    </view>
+        	    <view class="detailsCode">
+        	    	<image :src="qrcode"></image>
+        	    	<view class="detailsCode-text">
+        	    		<text>请出示以上券码给网点工作人员</text>
+        	    	</view>
+        	    </view>
+                
+                <!-- 门店定位 -->
+                <view class="detailsStore">
+                	<view class="detailsStore-top">
+                		<view class="detailsStore-title">
+                			适用门店
+                		</view>
+                		<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + details.id + '&type=campus'" v-if="longitude != 0 && latitude != 0">
+                			查看所有
+                			<image src="/static/icon/arrow_left.png"></image>
+                		</navigator>
+                	</view>
+                	<view class="location" v-if="longitude == 0 && latitude == 0">
+                		<image class="location-img" src="/static/img/location_img.jpg"></image>
+                		<text>您尚未授权本时生活开启定位服务</text>
+                		<text>不能看到附近的商家哦，点击下方按钮开启</text>
+                		<button class="location-btn" size="mini" open-type="openSetting">
+                			开启定位服务
+                		</button>
+                	</view>
+                	<view v-else>
+                		<block v-if="stores.length > 0">
+                			<view class="detailsStore-list" :data-id="(item.store_id)" v-for="(item, index) in stores" :key="index"
+                				@tap="detailsTap">
+                				<image :src="item.cover" class="detailsStore-logo"></image>
+                				<view class="detailsStore-cont">
+                					<view class="detailsStore-left">
+                						<view class="nowrap detailsStore-name">
+                							{{ item.title }}
+                						</view>
+                						<view class="detailsStore-place">
+                							<text class="nowrap">{{ item.address }}</text>
+                							{{ item.km }}
+                						</view>
+                					</view>
+                					<image class="detailsStore-tel" src="/static/icon/tel.png" @tap.stop="tel"
+                						:data-tel="(item.mobile)"></image>
+                				</view>
+                			</view>
+                		</block>
+                		<block v-else>
+                			<view class="pages-hint">
+                				<image src="/static/img/null_icon.png"></image>
+                				<view>暂无门店</view>
+                			</view>
+                		</block>
+                	</view>
+                </view>
+        	</view>
+            <!-- 使用须知 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		使用须知
+            	</view>
+            	<view class="detailsText-tips">
+            		<rich-text :nodes="remark"></rich-text>
+            	</view>
+            </view>
+            
+            <!-- 内容介绍 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		内容介绍
+            	</view>
+            	<view class="detailsText-tips" v-if="content != null">
+            		<rich-text :nodes="content"></rich-text>
+            	</view>
+            </view>
+        </view>
+        
+        <!-- 底部 -->
+        <view class="detailsBottom">
+            <image src="/static/img/campus_details_back.png" mode="aspectFill"></image>
+            <view class="detailsBottom-cont">
+                <view class="detailsBottom-title">
+                    抽奖活动
+                </view>
+                亿时代 - 本时生活
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { qrcode, barcode, couponinfo, merchantCard } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                id          : 0,        //优惠券id
+                longitude   : 0,        //经度
+                latitude    : 0,        //纬度
+                details     : '',       //优惠券信息
+                stores      : [],       //商家列表
+                content     : '',       //内容介绍
+                remark      : '',       //使用须知
+                qrcode      : '',       //二维码
+                barcode     : '',       //条形码
+                merchantcardinfo:''     //商家券信息
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 优惠券id
+            this.id = options.id
+    
+            // 获取二维码
+            qrcode(options.id).then(res=>{
+                this.qrcode = res.qrcode
+            })
+            
+            // 获取条形码
+            barcode(options.id).then(res=>{
+                this.barcode = res.barcode
+            })
+        },
+        
+        onShow () {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 查看定位信息
+            this.getCity();
+        },
+        
+        methods: {
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.id,
+                    user_lng: this.longitude,
+                    user_lat: this.latitude
+                }).then(res=>{
+                    console.log(res)
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.details = res.info
+                    this.stores  = stores
+                    this.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    //获取商家券信息
+                    if(res.info.card_type=='merchant_card'){
+                        this.getMerchantCardInfo()
+                    }
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商家券信息
+            getMerchantCardInfo(){
+                merchantCard(this.id).then(res=>{
+                   this.merchantcardinfo  = res
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 拨打电话
+            tel(e) {
+                let tel = e.currentTarget.dataset.tel
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                    url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat + '&type=campus'
+                })
+            },
+            
+            // 获取位置
+            getCity(){
+                uni.getLocation({
+                    success: res => {
+                        this.latitude   = res.latitude,
+                        this.longitude  = res.longitude
+                    },
+                    complete: (err) => {
+                        // 获取详情信息
+                        this.detailsInfo();
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 卡券详情 */
+    .details {
+        background: #ffffff;
+        margin: 20rpx 20rpx 0;
+        overflow: hidden;
+        width: calc(100% - 40rpx);
+        box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+        position: relative;
+        border-radius: 0 0 20rpx 20rpx;
+        border-bottom: 240rpx solid transparent;
+    }
+    
+    .details::after,
+    .details::before {
+        position: absolute;
+        background: #e83241;
+        content: '';
+        top: -50rpx;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    
+    .details::after {
+        left: -50rpx;
+    }
+    
+    .details::before {
+        right: -50rpx;
+    }
+    
+    .detailsCotent {
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop {
+        border-bottom: 2rpx dashed #c8c8c8;
+        padding: 40rpx 0;
+        text-align: center;
+        background-color: #f5f5f5;
+    }
+    
+    .detailsTop-name {
+        font-size: 38rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        padding: 0 60rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop-time {
+        color: #7e7e7e;
+        font-size: 26rpx;
+    }
+    
+    .detailsCode {
+        text-align: center;
+        padding: 0 0 20rpx;
+        margin: 40rpx 0 30rpx;
+    }
+    
+    .detailsCode image {
+        width: 300rpx;
+        height: 300rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    
+    .detailsCode-text {
+        text-align: center;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #000;
+    }
+    
+    .detailsCode-text text {
+        color: #999;
+        font-weight: normal;
+        font-size: 26rpx;
+    }
+    
+    .detailsStore {
+        border-top: 2rpx #c8c8c8 solid;
+        padding-top: 40rpx;
+    }
+    
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 130rpx;
+        top: 0;
+        width: calc(100% - 130rpx);
+        display: flex;
+    }
+    
+    .detailsStore-left {
+        width: calc(100% - 90rpx);
+        margin-right: 30rpx;
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+        border-top: 2rpx solid #ececec;
+    }
+    
+    .detailsText-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText-tips {
+        font-size: 26rpx;
+        line-height: 50rpx;
+        color: #555557;
+        padding-bottom: 20rpx;
+    }
+    
+    .detailsCode-join {
+        color: #ee8e44;
+        font-size: 24rpx;
+        border-radius: 50rpx;
+        border: 2rpx solid #ee8e44;
+        padding: 10rpx 20rpx;
+        display: inline-block;
+        margin-top: 30rpx;
+    }
+    
+    .detailsCode-join.active {
+        border: 2rpx solid #999;
+        color: #999;
+    }
+    
+    .source{ 
+        margin: 30rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .location {
+        background: white;
+        width: 100%;
+        text-align: center;
+        margin: 60rpx 0 0;
+    }
+    
+    .location text {
+        font-size: 28rpx;
+        display: block;
+        line-height: 46rpx;
+        color: #999;
+    }
+    
+    .location-btn[size="mini"] {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 66rpx;
+        margin-top: 30rpx;
+    }
+    
+    .location-img {
+        width: 150rpx;
+        height: 120rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsBar {
+        text-align: center;
+        padding: 0 50rpx;
+        box-sizing: border-box;
+        margin-top: 60rpx;
+        margin-bottom: 40rpx;
+    }
+    
+    
+    .detailsBar image {
+        width: 100%;
+    }
+    
+    .detailsBar .detailsCode-text {
+        margin-bottom: 10px;
+        color: #000;
+    }
+    
+    .detailsBottom {
+        position: fixed;
+        width: 100%;
+        height: 220rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 9;
+    }
+    .detailsBottom image {
+         width: 100%;
+         height: 100%;
+         position: absolute;
+         left: 0;
+         top: 0;
+    }
+    
+    .detailsBottom-cont {
+        z-index: 10;
+        position: absolute;
+        left: 0;
+        top: 70rpx;
+        width: 100%;
+        text-align: center;
+        color: #9a9a9a;
+        font-size: 26rpx;
+    }
+    
+    .detailsBottom-title {
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        font-size: 30rpx;
+    }
+</style>
diff --git a/pages/draw/index.vue b/pages/draw/index.vue
new file mode 100644
index 0000000..44f1f89
--- /dev/null
+++ b/pages/draw/index.vue
@@ -0,0 +1,603 @@
+<template>
+    <view class="content">
+        <!-- 抽奖 -->
+        <image class="luckBack" src="https://card.ysd-bs.com/storage/materials/2022/05/12/luck_back.png"></image>
+        <view class="luck">
+            <image class="luckTitle" src="https://card.ysd-bs.com/storage/materials/2022/09/23/drawTitle.png" mode="widthFix"></image>
+            <view class="drawContent">
+                <image class="drawContent-back" src="https://card.ysd-bs.com/storage/materials/2022/05/16/ly-plate-c.png" mode="widthFix"></image>
+                <view class="drawContent-number" v-if="isUser">抽奖数<text>{{number >= 0 ? number : '0'}}</text>次</view>
+                <image class="drawContent-award" :animation="animationData" bindtransitionend='animationend' :src="picture" mode="widthFix"></image>
+                <image class="drawContent-arrow" @click="onExtracting" src="https://card.ysd-bs.com/storage/materials/2022/05/12/playbtn.png" mode="widthFix"></image>
+                <image class="drawFooter drawFooter-right" src="https://card.ysd-bs.com/storage/materials/2022/05/12/dial_rigntImg.png" mode="widthFix"></image>
+                <image class="drawFooter drawFooter-left" src="https://card.ysd-bs.com/storage/materials/2022/05/12/dial_leftImg.png" mode="widthFix"></image>
+            </view>
+            <view class="roll">
+                <view class="roll-title">
+                    - 参与抽奖用户 -
+                </view>
+                <swiper class="roll-list" interval="3000" autoplay circular vertical bindchange="swiperChange">
+                    <swiper-item class="roll-item" catchtouchmove="stopTouchMove" v-for="(item, index) in logsArr" :key="index">
+                        <view class="roll-name" v-if="item.user">
+                            {{item.user.nickname}}
+                        </view>
+                        <view class="roll-tel" v-if="item.user">
+                            {{item.user.username}}
+                        </view>
+                        <view class="roll-time">
+                            {{item.created_at}}
+                        </view>
+                    </swiper-item>
+                </swiper>
+            </view>
+            <navigator v-if="isUser" hover-class="none" :url="'logs?id=' + exchageId" class="dial-record">抽奖记录</navigator>
+            <view class="dial-btns">
+                <view @click="userNav('order?type=paid')" class="dial-btns-go">
+                    我的订单
+                </view>
+                <view @click="userNav('myCoupon')" class="dial-btns-go dial-btns-order">
+                    我的优惠券
+                </view>
+            </view>
+            <view class="setupLabel" @click="delStorage" v-if="isUser">
+                <view class="setupLabel-name">
+                    切换用户
+                </view>
+            </view>
+        </view>
+        
+        <!-- 弹出 -->
+        <view class="popBack" v-if="pointShow"></view>
+        <view class="popCont" v-if="pointShow">
+            <view class="popTips">
+                <image class="luckTips" src="https://card.ysd-bs.com/storage/materials/2022/05/12/luckTips.png" mode="widthFix"></image>
+                <view class="Tips-title">
+                    恭喜中奖
+                </view>
+                <view class="Tips-text">
+                    获得【{{prize}}】
+                </view>
+                <view class="Tips-btn">
+                    <image class="Tips-btn-image" src="https://card.ysd-bs.com/storage/materials/2022/05/12/luckBtn.png"></image>
+                    <view v-if="value == 2" class="Tips-btn-text" @click="exchange(luckId)">去兑换</view>
+                    
+                    <view v-else class="Tips-btn-text" @click="useGp(luckId)">去使用</view>
+                </view>
+                <view class="Tips-out">~温馨提示：请您尽快使用哦~</view>
+            </view>
+            <view class="luckClose">
+                <image src="/static/img/luckClose.png" mode="widthFix" @click="luckClosePop"></image>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, result } from '@/apis/interfaces/draw'
+    export default {
+        data() {
+            return {
+                isUser          : false,  // 用户是否登录
+                number          : '',   //抽奖次数
+                logsArr         : '',   //获奖列表
+                luckId          : '',   //抽奖列表id
+                pointShow       : false, //抽奖弹出
+                prize           : '',   //获得奖项标题
+                value           : '',   //获得奖项类型
+                animationData   : {},   //旋转动画
+                picture         : '',    //抽奖转盘图片
+                isState         : false, //抽奖状态
+                exchageId       : '',    //抽奖id
+                backGround      : '',
+                itemArr         : []
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 初始化动画信息
+            const animation = uni.createAnimation({
+                duration        : 2000,
+                timingFunction  : 'ease-in-out'
+            })
+            this.animation = animation
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            if(uni.getStorageSync("token")) {
+                this.isUser = true
+                // 获取抽奖默认信息（抽奖次数）
+            }
+            this.drawShow();
+        },
+        methods: {
+            // 抽奖默认信息（抽奖次数）
+            drawShow(){
+                index().then(res=>{
+                    this.countLengtht= res.lottery.items_count
+                    this.number      = res.lottery.number
+                    this.background  = res.lottery.background
+                    this.picture     = res.lottery.picture
+                    this.exchageId   = res.lottery.exchage_id
+                    this.itemArr     = res.lottery.items
+                    this.logsArr     = res.logs
+                })
+            },
+            
+            // 抽奖
+            onExtracting(){
+                if(uni.getStorageSync("token")) {
+                    result(this.exchageId).then(res=>{
+                        let runNum      = 3  // 旋转圈数
+                        // 检查抽奖状态
+                        if(this.isState) return
+                        if(this.number <= 0){
+                            uni.showToast({
+                                title: '今日抽奖次数已用完，请明天再来吧~',
+                                icon : 'none'
+                            })
+                            return
+                        }
+                        
+                        // 更新抽奖状态
+                        this.isState = true
+                        this.prize   = res.log.exchange_item.title
+                        this.value   = res.log.exchange_item.type.value
+                        this.luckId  = res.log.exchage_log_id
+                        
+                        //旋转角度
+                        this.runDeg = this.runDeg || 0;
+                        this.runDeg = this.runDeg + (360 - this.runDeg % 360) + (360 * runNum - (res.log.exchange_item.order - 1) * Math.round(360 / this.countLengtht))
+                        
+                        // 动画
+                        this.animation.rotate(this.runDeg).step()
+                        this.animationData = this.animation.export()
+                    
+                        // 提示用户中奖信息
+                        setTimeout(()=>{
+                            this.isState = false
+                            this.pointShow = true
+                        },3000)
+                    }).catch(err => {
+                        uni.showToast({
+                            title: err.message,
+                            icon: 'none'
+                        })
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/draw/signin'
+                })
+            },
+        
+            // 动画结束弹出
+            animationend(){
+                setTimeout(()=>{
+                    this.pointShow = true
+                },1000)
+            },
+        
+            // 关闭弹出
+            luckClosePop() {
+                uni.showModal({
+                    title   : '提示',
+                    content : '是否放弃此权益',
+                    success : res=> {
+                        if (res.confirm) {
+                            this.pointShow = false
+                        }
+                        
+                        // 获取抽奖默认信息（抽奖次数）
+                        this.drawShow();
+                    }
+                })
+            },
+            
+            // 兑换乐心三件套
+            exchange(id) {
+                uni.navigateTo({
+                    url: "choose?id=" + id
+                })
+                this.pointShow = false
+            },
+            
+            // 使用权益券
+            useGp(id){
+                uni.navigateTo({
+                    url: "right?luck_id=" + id
+                })
+                this.pointShow = false
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/draw/signin'
+                })
+            },
+            
+            // 退出登录
+            delStorage() {
+                uni.clearStorage()
+                uni.navigateTo({
+                    url:'/pages/draw/signin'
+                })
+            },
+            
+            // 禁止滚动
+            stopTouchMove() {
+                return false
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #e4353a;
+    }
+    
+    .luckBack {
+        position: fixed;
+        width: 100vw;
+        height: 100%;
+        left: 0;
+        top: 0;
+    }
+    
+    .luck {
+        position: fixed;
+        width: 100%;
+        overflow: hidden;
+        height: 100%;
+        z-index: 9;
+        left: 0;
+        top: 0;
+        padding: 80rpx 40rpx 20rpx;
+        box-sizing: border-box;
+        overflow-y: scroll;
+        text-align: center;
+    }
+    
+    .luckTitle {
+        width: 90%;
+    }
+    
+    .drawFooter{
+        position: absolute;
+        z-index: 9;
+    }
+    
+    .drawFooter-right {
+        width: 48%;
+        bottom: -70rpx;
+        right: -16%;
+    }
+    
+    .drawFooter-left {
+        width: 60%;
+        bottom: -30rpx;
+        left: -18%;
+    }
+    
+    /* 转盘 */
+    .drawContent{
+        margin: 60rpx auto 40rpx;
+        width: 100%;
+        padding-top: 100%;
+        position: relative;
+    }
+    
+    .drawContent-arrow,
+    .drawContent-back,
+    .drawContent-award{
+        position: absolute;
+    }
+    
+    .drawContent-back{
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+    }
+    
+    .drawContent-award{
+        width: 76%;
+        height: 76%;
+        top: 5.5%;
+        left: 13.5%;
+    }
+    
+    .drawContent-arrow{
+        width: 26%;
+        height: 26%;
+        top: 28%;
+        left: 39%;
+    }
+    
+    .drawContent-number {
+        bottom: 38rpx;
+        color: #ffffff;
+        left: 0;
+        width: 100%;
+        position: absolute;
+        text-align: center;
+        padding-left: 20rpx;
+        box-sizing: border-box;
+        font-size: 28rpx;
+    }
+    
+    .drawContent-number text {
+        font-weight: 600;
+        padding: 0 5rpx;
+    }
+    
+    .dial-btns {
+        padding-bottom: 40rpx;
+        display: flex;
+        .dial-btns-go {
+            flex: 2;
+            text-align: center;
+            box-sizing: border-box;
+            background-color: #ffeace;
+            border: 2rpx solid transparent;
+            color: #5a0000;
+            margin-top: 40rpx;
+            border-radius: 50rpx;
+            height: 80rpx;
+            line-height: 80rpx;
+            margin: 50rpx 15rpx 0;
+        }
+        .dial-btns-order {
+            background-color: #f3524a;
+            color: #ffeace;
+            border-color: #ffeace;
+        }
+    }
+    
+    /* 弹出 */
+    .popBack {
+        background-color: rgba(0, 0, 0, .7);
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        z-index: 99;
+    }
+    
+    .popCont {
+        display: -webkit-box;
+    	-webkit-box-orient: vertical;
+    	-webkit-box-pack: center;
+    	left: 0;
+    	right: 0;
+    	top: 0;
+    	bottom: 0;
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        z-index: 100;
+        padding: 140rpx 100rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .popTips{
+        color: #ffffff;
+        width: 100%;
+        padding: 140rpx 30rpx 30rpx;
+        box-sizing: border-box;
+        background-color: #de3935;
+        border-radius: 20rpx;
+        text-align: center;
+        color: #ffe3ba;
+        position: relative;
+    }
+    
+    .luckTips {
+        position: absolute;
+        top: -120rpx;
+        z-index: 101;
+        width: 60%;
+        left: 25%;
+    }
+    
+    .Tips-title {
+        font-size: 60rpx;
+        margin-bottom: 60rpx;
+    }
+    
+    .Tips-text {
+        font-size: 34rpx;
+    }
+    
+    .Tips-btn {
+        margin: 100rpx 0 20rpx;
+        position: relative;
+        padding-top: 14%;
+    }
+    
+    .Tips-btn-image {
+        position: absolute;
+        width: 70%;
+        height: 100%;
+        left: 15%;
+        top: 0;
+    }
+    
+    .Tips-btn-text {
+        font-size: 30rpx;
+        text-align: center;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        color: #c35b34;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        font-weight: 600;
+    	-webkit-box-pack: center;
+    }
+    
+    .Tips-out {
+        font-size: 28rpx;
+        line-height: 90rpx;
+    }
+    
+    .luckClose {
+        width: 100%;
+        text-align: center;
+        margin-top: 40rpx;
+    }
+    
+    .luckClose image {
+        width: 64rpx;
+        opacity: .5;
+    }
+    
+    /* 抽奖规则 */
+    .rulesBack {
+        background-color: rgba(0, 0, 0, .7);
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        z-index: 99;
+        display: none;
+    }
+    
+    .rulesCont {
+    	-webkit-box-orient: vertical;
+    	-webkit-box-pack: center;
+    	left: 0;
+    	right: 0;
+    	top: 25vh;
+    	bottom: 0;
+        position: fixed;
+        width: 100%;
+        height: 50vh;
+        z-index: 100;
+        display: none;
+    }
+    .rulesBack.active {
+        display: block;
+    }
+    
+    .rulesCont.active {
+        display: -webkit-box;
+    }
+    
+    .luckRules {
+        position: absolute;
+        left: 10%;
+        top: 0;
+        width: 80%;
+        box-sizing: border-box;
+        z-index: 100;
+    }
+    
+    .textRules {
+        position: absolute;
+        left: 10%;
+        top: 0;
+        width: 80%;
+        z-index: 101;
+        height: 100%;
+        padding: 60rpx 80rpx;
+        color: #ffffff;
+        line-height: 58rpx;
+        box-sizing: border-box;
+    }
+    
+    .rulesClose-title {
+        width: 60%;
+        display: block;
+        margin: 20rpx auto 40rpx;
+    }
+    
+    .textRules-text {
+        height: 70%;
+        overflow: hidden;
+        overflow-y: scroll;
+    }
+    
+    .rulesClose {
+        position: absolute;
+        z-index: 102;
+        right: 50rpx;
+        top: 60rpx;
+        width: 54rpx;
+        opacity: .8;
+    }
+    
+    .roll {
+        height: 160rpx;
+        overflow: hidden;
+        background-color: #f5675a;
+        border: 4rpx solid #ffeace;
+        border-radius: 20rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        margin: 60rpx 15rpx 0;
+        width: calc(100% - 30rpx);
+        .roll-title {
+            color: #ffeace;
+            font-size: 34rpx;
+        }
+        .roll-list {
+            height: 90rpx;
+        }
+        .roll-item {
+            height: 90rpx;
+            display: flex;
+            line-height: 90rpx;
+            color: #fff0dd;
+            font-size: 28rpx;
+            view {
+                flex: 3;
+            }
+            .roll-name {
+                text-align: left;
+            }
+            .roll-time {
+                text-align: right;
+            }
+        }
+    }
+    
+    // 中间记录
+    .dial-record {
+        position: absolute;
+        top: 20%;
+        right: 0;
+        background-color: rgba($color: #ffdba2, $alpha: .9);
+        border-radius: 30rpx 0 0 30rpx;
+        line-height: 58rpx;
+        font-size: 30rpx;
+        color: #b80501;
+        padding: 0 15rpx 0 20rpx;
+    }
+    
+    .setupLabel {
+        width: 100%;
+        text-align: center;
+        line-height: 90rpx;
+        color: #FFFFFF;
+        opacity: .8;
+    }
+</style>
diff --git a/pages/draw/logs.vue b/pages/draw/logs.vue
new file mode 100644
index 0000000..148e86b
--- /dev/null
+++ b/pages/draw/logs.vue
@@ -0,0 +1,175 @@
+<template>
+    <view class="content">
+        <!-- 抽奖tab -->
+        <view class="recordTab">
+            <view class="recordTab-label" :class="{active : stateType == item.type}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-index="(index)" :data-state="(item.type)">
+                {{ item.title }}
+            </view>
+        </view>
+        <view class="record" v-if="awardsArr.length > 0">
+            <view class="top">
+                <text>抽奖结果</text>
+                <text>抽奖状态</text>
+                <text>抽奖时间</text>
+                <text>操作</text>
+            </view>
+            <view class="list">
+                <view class="item" v-for="(item, index) in awardsArr" :key="index">
+                    <text class="itemText" v-if="item.exchange_item">{{item.exchange_item.title}}</text>
+                    <text class="itemText" v-if="item.status" :class="{red : item.status.value == 1}">{{item.status.text}}</text>
+                    <text class="itemText">{{item.created_at}}</text>
+                    <text class="itemText" v-if="stateType == 'right'">
+                        <view v-if="item.status.value == 1" class="itemText-go itemText-active">已使用</view>
+                        <navigator v-else class="itemText-go" hover-class="none" :url="'right?luck_id=' + item.exchage_log_id">去使用</navigator>
+                    </text>
+                    <text class="itemText" v-else>
+                        <view v-if="item.status.value == 1" class="itemText-go itemText-active">已领取</view>
+                        <navigator v-else class="itemText-go" hover-class="none" :url="'choose?id=' + item.exchage_log_id">去领取</navigator>
+                    </text>
+                </view>
+            </view>
+        </view>
+        <view class="pack-center pages-hint" wx:else>
+        	<image src="/static/img/staff_null.png"></image>
+        	<view>暂无抽奖记录</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { awards } from '@/apis/interfaces/draw'
+    export default {
+        data() {
+            return {
+                //抽奖Tab列表
+                couponLabel : [
+                    { title : "权益", type: 'right' },
+                    { title : "商品", type: 'goods' }
+                ],
+                stateType   : 'right', //订单状态
+                awardsArr   : []    //记录列表
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.couponId = options.id
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 获取记录列表
+            this.awardInfo();
+        },
+        methods: {
+            // 记录列表
+            awardInfo(id){
+                awards(this.couponId, {
+                    type: this.stateType
+                }).then(res=>{
+                    this.awardsArr = res
+                })
+            },
+            
+            // tab选择
+            orderTab(e){
+                this.stateType = e.currentTarget.dataset.state
+                // 获取记录列表
+                this.awardInfo();
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .recordTab {
+        position: fixed;
+        width: 100%;
+        height: 100rpx;
+        border-bottom: 2rpx solid #ebebeb;
+        z-index: 99;
+        left: 0;
+        top: 0;
+        display: flex;
+        padding: 20rpx 0;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        .recordTab-label {
+            flex: 2;
+            text-align: center;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                left: calc(50% - 20rpx);
+                bottom: 0;
+                background-color: #FFFFFF;
+                width: 40rpx;
+                height: 6rpx;
+                border-radius: 50rpx;
+            }
+            &.active {
+                color: #eb4747;
+            }
+            &.active::after {
+                background-color: #eb4747;
+            }
+        }
+    }
+    
+    .record {
+        width: 100%;
+        margin-top: 100rpx;
+        .top {
+            color: #999999;
+            background-color: #FFFFFF;
+            line-height: 90rpx;
+            font-size: 28rpx;
+            overflow: hidden;
+            text {
+                display: inline-block;
+                width: 25%;
+                text-align: center;
+            }
+        }
+        .list {
+            .item {
+                background-color: #FFFFFF;
+                line-height: 90rpx;
+                overflow: hidden;
+                border-top: 2rpx solid #ebebeb;
+                font-size: 26rpx;
+                .itemText {
+                    display: inline-block;
+                    width: 25%;
+                    text-align: center;
+                    &:nth-child(2) {
+                        color: green;
+                    }
+                    &:nth-child(2).active {
                        color: #eb4747;
                    }
+                    &.red {
+                        color: red;
+                    }
+                    .itemText-go {
+                        margin: 0 auto;
+                        background-color: #eb4747;
+                        height: 44rpx;
+                        line-height: 44rpx;
+                        width: 60%;
+                        text-align: center;
+                        color: #FFFFFF;
+                        border-radius: 10rpx;
+                        font-size: 24rpx;
+                        &.itemText-active {
+                            background-color: #d3d3d3;
+                        }
+                    }
+                }
+                
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/myCoupon.vue b/pages/draw/myCoupon.vue
new file mode 100644
index 0000000..be12ea8
--- /dev/null
+++ b/pages/draw/myCoupon.vue
@@ -0,0 +1,226 @@
+<template>
+    <view class="content">
+        <!-- 卡券tab -->
+        <view class="couponTab">
+            <view class="couponTab-label" :class="{active : stateType == item.used}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-state="(item.used)">
+                {{ item.title }}
+                <!-- <text v-if="item.used == 0">({{couponLabel.length}}张)</text>
+                <text v-else-if="item.used == 1">({{couponLabel.length}}张)</text>
+                <text v-else>({{couponLabel.length}}张)</text> -->
+            </view>
+        </view>
+        
+        <!-- 卡券列表 -->
+        <view class="coupon" v-if="couponsArr.length > 0">
+            <view hover-class="none" class="couponList" v-for="(item, index) in couponsArr" :key="index">
+                <!-- 优惠券 -->
+                <image class="couponList-left" v-if="item.status == 0" src="/static/img/draw_coupon.png" mode="widthFix"></image>
+                <image class="couponList-left" v-else src="/static/img/draw_coupon_active.png" mode="widthFix"></image>
+                <view class="couponList-center">
+                    <view class="nowrap couponList-title">{{item.name}}</view>
+                    <view class="nowrap couponList-used">活动来源： {{item.activity_name}}</view>
+                    <view class="couponList-time">{{item.startTime}} 至 {{item.endTime}}</view>
+                </view>
+                <navigator hover-class="none" :url="'couponDetails?id=' + item.id" class="couponList-right" v-if="item.status == 0">
+                    去使用
+                </navigator>
+                <view class="couponList-right couponList-right-active" v-else>
+                    {{item.status == 1 ? '已使用' : '已过期'}}
+                </view>
+                <!-- v-if="item.status == 1" -->
+                <!-- <image src="/static/img/coupon_tips_00.png" class="coupoTips"></image> -->
+                <!-- <image v-if="item.status == 2" src="/static/img/coupon_tips_01.png" class="coupoTips"></image> -->
+            </view>
+            <view class="pagesLoding" v-if="lodingStats">
+                <block v-if="page.has_more">
+                    <image class="pagesLodingIcon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+                </block>
+                <block v-else>
+                    没有更多了~
+                </block>
+            </view>
+        </view>
+        
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+            <image src="/static/img/null_icon.png"></image>
+            <view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { coupons } from '@/apis/interfaces/draw'
+    export default {
+        data() {
+            return {
+                couponsArr  : [],   //优惠券列表
+                count       : '',   //优惠券-张数
+                //优惠券Tab列表
+                couponLabel : [
+                    { title : "未使用", used: 0 },
+                    { title : "已使用", used: 1 },
+                    { title : "已过期", used: 2 }
+                ],
+                stateType   : '0', //卡券状态
+                type        : '',  //卡券来源
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 获取优惠券列表
+            this.couponInfo();
+        },
+        methods: {
+            // 订单列表
+            couponInfo(page){
+                coupons({
+                    status: this.stateType,
+                    page  : page || ''
+                }).then(res=>{
+                    let listArr = this.couponsArr,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+                            
+                    newData = listArr.concat(res.data)
+                    this.couponsArr  = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/draw/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // tab选择
+            orderTab(e){
+                this.stateType = e.currentTarget.dataset.state
+                // 获取优惠券列表
+                this.couponInfo();
+            },
+            
+            // 页面相关事件处理函数--监听用户下拉动作
+            onPullDownRefresh() {
+                // 获取优惠券列表
+                this.couponInfo();
+            },
+                    
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.couponInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .couponTab{
+        position: fixed;
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+        z-index: 99;
+        left: 0;
+        top: 0;
+        display: flex;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        .couponTab-label {
+            flex: 3;
+            text-align: center;
+            text {
+                display: block;
+                font-size: 28rpx;
+                color: #999999;
+                line-height: 54rpx;
+            }
+            &.active {
+                color: #eb4747;
+            }
+            &.active text {
+                color: #ff8b8b;
+            }
+        }
+    }
+    
+    .coupon {
+        width: 100%;
+        margin-top: 90rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+        .couponList {
+            background-color: #FFFFFF;
+            height: 190rpx;
+            border-radius: 20rpx;
+            margin-bottom: 30rpx;
+            padding: 30rpx;
+            box-sizing: border-box;
+            position: relative;
+            .couponList-left {
+                width: 80rpx;
+            }
+            .couponList-center {
+                position: absolute;
+                width: 100%;
+                left: 0;
+                top: 0;
+                padding: 30rpx 100rpx 0 140rpx;
+                box-sizing: border-box;
+                color: #999999;
+                font-size: 28rpx;
+                .couponList-title {
+                    color: #000000;
+                    font-size: 30rpx;
+                    font-weight: 600;
+                    width: 70%;
+                }
+                .couponList-used {
+                    line-height: 54rpx;
+                }
+            }
+            .couponList-right {
+                position: absolute;
+                width: 120rpx;
+                line-height: 50rpx;
+                text-align: center;
+                right: 25rpx;
+                font-size: 28rpx;
+                top: 25rpx;
+                color: #eb4747;
+                border: 2rpx solid #eb4747;
+                border-radius: 50rpx;
+                &.couponList-right-active {
+                    border-color: #ddd;
+                    color: #a9a9a9;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/order.vue b/pages/draw/order.vue
new file mode 100644
index 0000000..35ec907
--- /dev/null
+++ b/pages/draw/order.vue
@@ -0,0 +1,239 @@
+<template>
+    <view class="content">
+        <!-- 订单tab -->
+        <view class="couponTab">
+            <view class="couponTab-label" :class="{active : stateType == item.type}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-state="(item.type)">
+                {{ item.title }}
+            </view>
+        </view>
+        
+        <!-- 订单列表 -->
+        <view class="order" v-if="ordersArr.length > 0">
+            <view class="orderList" v-for="(item, index) in ordersArr" :key="index">
+                <view class="orderList-title">
+                    <image class="orderList-icon" src="/static/img/draw_order.png" mode="widthFix"></image>订单号：{{item.orderid}}
+                </view>
+                <view class="orderList-label">
+                    <view class="orderList-item">
+                        <text>产品名称</text>{{item.award.title}}
+                    </view>
+                    <view class="orderList-item">
+                        <text>产品价格</text>
+                        {{item.amount != 0 ? '￥' + item.amount : '免费兑换'}}
+                    </view>
+                </view>
+                <view class="orderList-tool">
+                    <view class="orderList-time">
+                        {{item.created_at}}
+                    </view>
+                    <!-- <navigator hover-class="none" url="orderDetails" class="orderList-btn">
+                        详 情
+                    </navigator> -->
+                </view>
+            </view>
+            <view class="pagesLoding" v-if="lodingStats">
+                <block v-if="page.has_more">
+                    <image class="pagesLodingIcon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+                </block>
+                <block v-else>
+                    没有更多了~
+                </block>
+            </view>
+        </view>
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+        	<image src="/static/img/coupon_tips.png"></image>
+        	<view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { orders  } from '@/apis/interfaces/draw'
+    export default {
+        data() {
+            return {
+                ordersArr  : [],  //订单列表
+                //订单Tab列表
+                couponLabel : [
+                    { title : "已支付", type: 'paid' },
+                    { title : "未支付", type: 'unpay' }
+                ],
+                stateType   : 'paid', //订单状态
+                page        : 1,     //分页
+                lodingStats : false  //加载状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            console.log(options)
+            this.stateType = options.type
+        },
+        
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 获取订单列表
+            this.orderInfo();
+        },
+		
+        methods: {
+            // 订单列表
+            orderInfo(page){
+                orders({
+                    type: this.stateType,
+                    page: page || ''
+                }).then(res=>{
+                    console.log(res.data)
+                    
+                    let listArr = this.ordersArr,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+                            
+                    newData = listArr.concat(res.data)
+                    this.ordersArr   = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/draw/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // tab选择
+            orderTab(e){
+                this.stateType = e.currentTarget.dataset.state
+                // 获取订单列表
+                this.orderInfo();
+            },
+            
+            // 页面相关事件处理函数--监听用户下拉动作
+            onPullDownRefresh() {
+                // 获取订单列表
+                this.orderInfo();
+            },
+                    
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.orderInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .couponTab{
+        position: fixed;
+        width: 100%;
+        height: 100rpx;
+        z-index: 99;
+        left: 0;
+        top: 0;
+        display: flex;
+        padding: 20rpx 0;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        .couponTab-label {
+            flex: 4;
+            text-align: center;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                left: calc(50% - 20rpx);
+                bottom: 0;
+                background-color: #FFFFFF;
+                width: 40rpx;
+                height: 6rpx;
+                border-radius: 50rpx;
+            }
+            &.active {
+                color: #eb4747;
+            }
+            &.active::after {
+                background-color: #eb4747;
+            }
+        }
+    }
+    .order {
+        width: 100%;
+        margin-top: 100rpx;
+        padding: 30rpx;
+        box-sizing: border-box;
+        .orderList {
+            background-color: #FFFFFF;
+            border-radius: 20rpx;
+            margin-bottom: 30rpx;
+            .orderList-title {
+                padding: 0 30rpx;
+                box-sizing: border-box;
+                line-height: 90rpx;
+                display: flex;
+                font-size: 30rpx;
+                border-bottom: 2rpx solid #eeeeee;
+                .orderList-icon {
+                    width: 40rpx;
+                    height: 40rpx;
+                    margin: 25rpx 20rpx 0 0;
+                }
+            }
+            .orderList-label {
+                padding: 10rpx 30rpx;
+                border-bottom: 2rpx solid #eeeeee;
+                box-sizing: border-box;
+                font-size: 28rpx;
+                .orderList-item {
+                    display: flex;
+                    line-height: 60rpx;
+                    text {
+                        display: block;
+                        flex: 1;
+                        color: #666666;
+                    }
+                }
+            }
+            .orderList-tool {
+                padding: 0 30rpx;
+                line-height: 90rpx;
+                box-sizing: border-box;
+                display: flex;
+                font-size: 28rpx;
+                color: #999999;
+                .orderList-time {
+                    flex: 1;
+                }
+                .orderList-btn {
+                    font-size: 28rpx;
+                    color: #e31828;
+                    border: 2rpx solid #e31828;
+                    display: inline-block;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    margin-top: 16rpx;
+                    border-radius: 40rpx;
+                    padding: 0 25rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/orderDetails.vue b/pages/draw/orderDetails.vue
new file mode 100644
index 0000000..fdc7e0e
--- /dev/null
+++ b/pages/draw/orderDetails.vue
@@ -0,0 +1,229 @@
+<template>
+    <view class="content">
+        <view class="orderData">
+            <view class="While">
+                <view class="orderData-cont-label">
+                    <image class="orderData-cont-img" src="/static/icon/orderIcon_01.png" mode="aspectFill"></image>
+                    <view class="orderData-cont-text">
+                        <view class="orderData-cont-name">订单编号</view>
+                        <view class="orderData-cont-copy">
+                            <text class="nowrap">57843657846357834</text>
+                            <view bindtap="copyUrl">复制</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="orderData-cont-label">
+                    <image class="orderData-cont-img" src="/static/icon/orderIcon_00.png" mode="aspectFill"></image>
+                    <view class="orderData-cont-text">
+                        <view class="orderData-cont-name">慢慢悠 <text>1800000000</text></view>
+                        <view class="orderData-cont-copy">
+                            汗水里156高
+                        </view>
+                    </view>
+                </view>
+            </view>
+        
+            <view class="While reserveCont">
+                <view class="reserveCont-title">订单信息</view>
+                <view class="reserve-label">
+                    <view class="reserve-name">商品</view>
+                    <view class="reserve-text">乐心血压仪</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">金额</view>
+                    <view class="reserve-text reserve-red">￥399</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">交易时间</view>
+                    <view class="reserve-text">2022-09-23 15:00</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">运费金额</view>
+                    <view class="reserve-text">免邮</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">交易状态</view>
+                    <view class="reserve-text green">待发货</view>
+                </view>
+            </view>
+            <view class="While reserveCont">
+                <view class="reserveCont-title">物流信息</view>
+                <view class="reserve-label">
+                    <view class="reserve-name">物流公司</view>
+                    <view class="reserve-text">顺丰速递</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">收货姓名</view>
+                    <view class="reserve-text green">慢悠悠</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">收货电话</view>
+                    <view class="reserve-text green">15000000000</view>
+                </view>
+                <view class="reserve-label">
+                    <view class="reserve-name">物流单号</view>
+                    <view class="reserve-text">6546546546546<view class="reserve-copy" bindtap="copyUrl">复制</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="order-data-footer">
+            <navigator hover-class="none" class="order-btn" open-type="navigateBack">返回订单</navigator>
+            <view class="order-btn" bindtap="signClick">签收订单</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import {  } from '@/apis/interfaces/draw'
+    export default {
+        data() {
+            return {
+               
+            }
+        },
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+		
+        methods: {
+			
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        padding: 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .orderData {
+        border-bottom: 70rpx transparent solid;
+    }
+    
+    .While {
+        border-radius: 10rpx;
+        margin-bottom: 30rpx;
+        background-color: #FFFFFF;
+        box-shadow: 0 0 10rpx rgba(0, 0, 0, .05);
+    }
+    
+    /* 订单 */
+    .orderData-cont-label {
+        padding: 40rpx 30rpx;
+        display: flex;
+        box-sizing: border-box;
+        border-bottom: #f2f2f2 2rpx solid;
+        .orderData-cont-img {
+            width: 48rpx;
+            height: 48rpx;
+            vertical-align: middle;
+        }
+        
+        .orderData-cont-text {
+            width: calc(100% - 68rpx);
+            margin-left: 20rpx;
+            box-sizing: border-box;
+        }
+        
+        .orderData-cont-name {
+            margin-bottom: 10rpx;
+        }
+        
+        .orderData-cont-name text {
+            color: #999;
+            padding-left: 20rpx;
+        }
+        
+        .orderData-cont-copy {
+            display: flex;
+            font-size: 28rpx;
+            color: #999;
+        }
+        
+        .orderData-cont-copy text {
+            flex: 1;
+            display: inline-block;
+            margin-right: 20rpx;
+        }
+        
+        .orderData-cont-copy view {
+            color: #e31828;
+        }
+    }
+    
+    /* 规格 */
+    .reserveCont-title {
+        font-weight: 600;
+        padding: 30rpx;
+    }
+    
+    .reserve-label {
+        display: flex;
+        padding: 0 30rpx 30rpx;
+        box-sizing: border-box;
+        font-size: 28rpx;
+    }
+    
+    .reserve-name {
+        flex: 1;
+        width: 200rpx;
+        margin-right: 20rpx;
+        color: #7e7e7e;
+    }
+    
+    .reserve-text {
+        width: calc(100% - 240rpx);
+        text-align: right;
+        line-height: 50rpx;
+    }
+    
+    .reserve-copy {
+        color: #fa8524;
+        border: #fa8524 2rpx solid;
+        display: inline-block;
+        height: 34rpx;
+        line-height: 34rpx;
+        font-size: 26rpx;
+        padding: 0 10rpx;
+        border-radius: 4rpx;
+        margin-left: 10rpx;
+    }
+    
+    .reserve-red {
+        font-weight: 600;
+        color: #e31828;
+    }
+    
+    /* 底部菜单 */
+    .order-data-footer {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        border-top: solid 1rpx #f2f2f2;
+        padding-top: 17rpx;
+        padding-right: 30rpx;
+        padding-left: 30rpx;
+        height: 83rpx;
+        background: white;
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row-reverse;
+        z-index: 9;
+    }
+    
+    .order-btn {
+        margin-left: 20rpx;
+        height: 58rpx;
+        line-height: 58rpx;
+        box-sizing: border-box;
+        border: solid 1rpx #747788;
+        padding: 0 20rpx;
+        font-size: 26rpx;
+        border-radius: 10rpx;
+        margin-top: 5rpx;
+    }
+</style>
diff --git a/pages/draw/password.vue b/pages/draw/password.vue
new file mode 100644
index 0000000..f34722d
--- /dev/null
+++ b/pages/draw/password.vue
@@ -0,0 +1,190 @@
+<template>
+    <view class="content">
+        <image class="drawTitle" src="@/static/img/draw-title.png" mode="widthFix"></image>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+        		<view class="campus-inputs">
+        		    <image class="campus-form-icon" src="/static/img/draw_login_02.png" mode="aspectFill"></image>
+        		    <input class="campus-form-input" maxlength="11" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile" placeholder-style="color:#c9c9c9;"></input>
+        		</view>
+                <view class="inputs-code">
+                    <view class="campus-inputs">
+                        <image class="campus-form-icon" src="/static/img/draw_login_04.png" mode="aspectFill"></image>
+                    	<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4" placeholder-style="color:#c9c9c9;"></input>
+                    </view>
+                    <button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+                </view>
+        		<button class="campus-form-btn" form-type="submit">设置新密码</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+		
+        methods: {
+			// mobileNo
+			getNameValue(e) {
+			    this.mobileNo = e.detail.value
+			},
+			
+			// 获取code
+			getCode(){
+			    let mobileNo = this.mobileNo,
+			        myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+			        
+			    var _this    = this
+			    if  (mobileNo == "") {
+			        uni.showToast({
+			            title     : '手机号不能为空',
+			            icon      : 'none',
+			            duration  : 1000
+			        })
+			        return false;
+			    }else if (!myreg.test(mobileNo)) {
+			        uni.showToast({
+			            title     : '请输入正确的手机号',
+			            icon      : 'none',
+			            duration  : 1000
+			        })
+			        return false;
+			    }else{
+			        send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+			            uni.showToast({
+			                title   : '发送成功',
+			                icon    : 'success',
+			                duration: 2000
+			            })
+			            var num = 61;
+			            var timer = setInterval(function () {
+			                num--;
+			                if (num <= 0) {
+			                    clearInterval(timer);
+			                    _this.codename  = '重新发送'
+			                    _this.disabled  = false
+			        
+			                } else {
+			                    _this.codename  = num + "s后重新获取"
+			                    _this.disabled  = true
+			                }
+			            }, 1000)
+			        }).catch(err=>{})
+			    }
+			},
+			
+			// 获取后输入code
+			getCodeValue (e) {
+			    this.code = e.detail.value
+			},
+			
+			// 立即登录
+			forgetlogin(e){
+			    let mobileNo = e.detail.value.mobile || '',
+			        code     = this.code || ''
+					
+				auth({
+					mobile: mobileNo,
+					code: code,
+					type: 'reset_password'
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.redirectTo({
+						url: '/pages/draw/setPassword'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+        }
+    }
+</script>
+
+<style lang="scss">
+	page {
+	    background-color: #f67b5a;
+	}
+	
+	.drawTitle {
+	    width: 100%;
+	}
+	
+	.campus-cont {
+	    padding: 10rpx 50rpx 60rpx;
+	    box-sizing: border-box;
+	    .campus-inputs {
+	        background-color: #FFFFFF;
+	        border-radius: 10rpx;
+	        margin-bottom: 30rpx;
+	        height: 100rpx;
+	        line-height: 100rpx;
+	        display: flex;
+	        padding: 0 30rpx;
+	        box-sizing: border-box;
+	        .campus-form-icon {
+	            width: 50rpx;
+	            height: 50rpx;
+	            margin: 25rpx 20rpx 0 0;
+	        }
+	        .campus-form-input {
+	            width: calc(100% - 70rpx);
+	            height: 100%;
+	            line-height: 100rpx;
+	            font-size: 32rpx;
+	        }
+	    }
+	    .campus-form-btn {
+	        background-color: #ffe455;
+	        border-radius: 10rpx;
+	        line-height: 100rpx;
+	        font-size: 36rpx;
+	        color: #6a4902;
+	        margin-top: 20rpx;
+	        box-shadow: 4rpx 4rpx 6rpx #c62024;
+	    }
+	    .login-box {
+	        display: flex;
+	        line-height: 90rpx;
+	        padding: 0 10rpx;
+	        box-sizing: border-box;
+	        color: #FFFFFF;
+	        font-size: 32rpx;
+	        .login-box-flex {
+	            flex: 1;
+	        }
+	    }
+	}
+    
+    .inputs-code {
+        display: flex;
+        .campus-inputs {
+            flex: 1;
+        }
+        .campus-form-code {
+            background-color: #ffe455;
+            color: #735b1f;
+            font-size: 32rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            margin-left: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/draw/register.vue b/pages/draw/register.vue
new file mode 100644
index 0000000..3a5560d
--- /dev/null
+++ b/pages/draw/register.vue
@@ -0,0 +1,195 @@
+<template>
+	<view class="content">
+        <image class="drawTitle" src="@/static/img/draw-title.png" mode="widthFix"></image>
+        <view class="campus-cont">
+            <form @submit="submitRegister">
+        		<view class="campus-inputs">
+        		    <image class="campus-form-icon" src="/static/img/draw_login_02.png" mode="aspectFill"></image>
+        		    <input class="campus-form-input" maxlength="11" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile" placeholder-style="color:#c9c9c9;"></input>
+        		</view>
+                <view class="inputs-code">
+                    <view class="campus-inputs">
+                        <image class="campus-form-icon" src="/static/img/draw_login_04.png" mode="aspectFill"></image>
+                    	<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4" placeholder-style="color:#c9c9c9;"></input>
+                    </view>
+                    <button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+                </view>
+        		<view class="campus-inputs">
+        		    <image class="campus-form-icon" src="/static/img/draw_login_03.png" mode="aspectFill"></image>
+        		    <input class="campus-form-input" maxlength="6" type="password" placeholder="请设置登录密码" name="password" placeholder-style="color:#c9c9c9;"></input>
+        		</view>
+                <view class="campus-inputs">
+                    <image class="campus-form-icon" src="/static/img/draw_login_03.png" mode="aspectFill"></image>
+                    <input class="campus-form-input" maxlength="6" type="password" placeholder="请确认登录密码" name="password_confirmation" placeholder-style="color:#c9c9c9;"></input>
+                </view>
+        		<button class="campus-form-btn" form-type="submit">立即注册</button>
+            </form>
+        	<view class="login-box">
+        		<navigator class="login-box-flex" hover-class="none" url="signin">已有账号，立即登录</navigator>
+        	</view>
+        </view>
+	</view>
+</template>
+
+<script>
+    import { register, send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+        
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo
+                    
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{
+						uni.showToast({
+						    title   : err.message,
+							icon	:'none',
+						    duration: 2000
+						})
+					})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即注册
+            submitRegister(e){
+				let formValue = e.detail.value,
+                    code     = this.code || ''
+				register({
+					mobile					: formValue.mobile,
+					password				: formValue.password,
+					password_confirmation	: formValue.password_confirmation,
+                    code                    : code
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/draw/index'
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	page {
+	    background-color: #f67b5a;
+	}
+	
+	.drawTitle {
+	    width: 100%;
+	}
+	
+	.campus-cont {
+	    padding: 10rpx 50rpx 20rpx;
+	    box-sizing: border-box;
+	    .campus-inputs {
+	        background-color: #FFFFFF;
+	        border-radius: 10rpx;
+	        margin-bottom: 30rpx;
+	        height: 100rpx;
+	        line-height: 100rpx;
+	        display: flex;
+	        padding: 0 30rpx;
+	        box-sizing: border-box;
+	        .campus-form-icon {
+	            width: 50rpx;
+	            height: 50rpx;
+	            margin: 25rpx 20rpx 0 0;
+	        }
+	        .campus-form-input {
+	            width: calc(100% - 70rpx);
+	            height: 100%;
+	            line-height: 100rpx;
+	            font-size: 32rpx;
+	        }
+	    }
+	    .campus-form-btn {
+	        background-color: #ffe455;
+	        border-radius: 10rpx;
+	        line-height: 100rpx;
+	        font-size: 36rpx;
+	        color: #6a4902;
+	        margin-top: 40rpx;
+	        box-shadow: 4rpx 4rpx 6rpx #c62024;
+	    }
+	    .login-box {
+	        line-height: 90rpx;
+	        padding: 0 10rpx;
+	        box-sizing: border-box;
+	        color: #FFFFFF;
+	        font-size: 32rpx;
+            text-align: center;
+	    }
+	}
+    
+    .inputs-code {
+        display: flex;
+        .campus-inputs {
+            flex: 1;
+        }
+        .campus-form-code {
+            background-color: #ffe455;
+            color: #735b1f;
+            font-size: 32rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            margin-left: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/draw/right.vue b/pages/draw/right.vue
new file mode 100644
index 0000000..2af9d21
--- /dev/null
+++ b/pages/draw/right.vue
@@ -0,0 +1,797 @@
+<template>
+    <view>
+        <!-- 按钮 -->
+        <view class="newrightsBtn" @click="payment">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{rightData.num}}件商品  </view> 
+        		<view>实付：<text>￥{{rightData.total}}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 重要提示 -->
+        <view class="rightsPoint">
+        	<view class="rightsPoint-cont">
+        		<view class="rightsPoint-top">
+        			<image src="/static/icon/Point_icon.png"></image>
+        			<text>重要提示</text>
+        		</view>
+        		<view class="rightsPoint-text" :class="{active : pointMoreShow}">
+        			<rich-text :nodes="notice.notification"></rich-text>
+        		</view>
+        		<view class="pointMore" bindtap="pointMoreTap">
+        			<text>{{pointMoreShow == true ? '收起' : '展开'}}</text>
+        			<image :src="pointMoreShow == true ? '/static/img/pointMore-up.png' : '/static/img/pointMore.png'">
+        			</image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 卡券 -->
+        <view style="padding-bottom: 220px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="https://card.ysd-bs.com/storage/materials/2022/05/13/class_back_02.png" mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+                                <image :src="item" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                        <view class="nowrap rightsCont-btn">
+                            {{rightData.detail.title}}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.goods_cover" mode="widthFix"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number">￥{{ rightData.detail.amount }}</view>
+                        <!-- <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" :class="{active : rightData.num != 1}">+</view>
+                        </view> -->
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <!-- <view class="noticeText-top">购买须知</view> -->
+                    <view class="noticeText-cont" v-if="notice.remark">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+                    
+                    <!-- <view class="noticeText-top">内容介绍</view> -->
+                    <view class="noticeText-cont" v-if="notice.content">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { exchangesBuy } from '@/apis/interfaces/draw'
+    import { activityBuy } from '@/apis/interfaces/draw'
+    import { getAuthUrl, wpayH5Info, h5Pay } from '@/apis/interfaces/rights'
+    const jweixin = require('jweixin-module');  //获取微信支付
+    export default {
+        data() {
+            return {
+                tradeNo  : '' , //订单
+                rightData: {
+                    detail      : '',  // 权益内容
+                    logId       : '',  // 权益id
+                    addressSee  : '',  // 收货地址
+                    num         : 1,   // 购买数量
+                    moreAmount  : '',  // 产品总金额
+                    freight     : '',  // 运费
+                    total       : ''   // 总金额
+                },
+                notice          : {
+                    remark      : '',     // 购买须知
+                    content     : '',     // 内容介绍
+                    noticeShow  : true   ,// 购买须知状态
+                    notification: ''
+                },
+                buyWay          : {
+                    platformCp  : [],  // 选择提交数组
+                    platIndex   : 0,   // 选择提交方式下标
+                    isdeliver   : -1   // 选择提交方式
+                },
+                address         : {
+                    allAddress  : [],      // 收货地址列表
+                    addressShow : false    // 地址显示状态
+                },
+                disabled        : false,   //购买按钮状态
+                pointMoreShow   : false,
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.rightData.logId = options.luck_id
+            // 判断是否微信授权登录过  只有外部游览器才用到（支付需要授权微信环境）
+            let status = navigator.userAgent.toLowerCase();
+            if (status.match(/MicroMessenger/i) == "micromessenger" && !options.code) {
+                let locationUrl = window.location.pathname.substr(1) + window.location.search
+                getAuthUrl(locationUrl).then(res=> {
+                    window.location.href = res
+                })
+            }
+            this.openid  = options.openid || ''
+            this.code    = options.code || ''  //用code换取oppid
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+            
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                activityBuy({activity_exchange_log_id: this.rightData.logId, qty: 1}).then(res => {
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.notification  = res.detail.notification.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {})
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收银台跳转
+            payment() {
+                exchangesBuy({
+                    name        : '',
+                    mobile      : '',
+                    address     : '',
+                    activity_exchange_item_goods_id: '',
+                    activity_exchange_log_id: this.rightData.logId,
+                    qty         : 1
+                }).then(res=>{
+                    this.tradeNo = res.trade_no
+                    this.wxBrowser()
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                });
+            },
+            
+            // 当支付环境为微信游览器情况下
+            wxBrowser() {
+                wpayH5Info({
+                    url: location.href.split('#')[0],
+                    list:'chooseWXPay'
+                }).then(wechatConfig => {
+                    let wxConfig = JSON.parse(wechatConfig)
+                    jweixin.config({
+                        appId: wxConfig.appId,
+                        debug: false,
+                        jsApiList: wxConfig.jsApiList,
+                        signature: wxConfig.signature,
+                        nonceStr: wxConfig.nonceStr,
+                        timestamp: wxConfig.timestamp
+                    })
+                    jweixin.ready(() => {
+                        let wechaUrl = 'payments/wechat'
+                        h5Pay(wechaUrl, {
+                            channel: 'h5',
+                            trade_no: this.tradeNo,
+                            code: this.code
+                        }).then(wechatRes => {
+                            let wechatPay = JSON.parse(wechatRes)
+                            jweixin.chooseWXPay({
+                                timestamp: wechatPay.timeStamp,
+                                nonceStr: wechatPay.nonceStr, 
+                                package: wechatPay.package,
+                                signType: wechatPay.signType,
+                                paySign: wechatPay.paySign,
+                                success: payRes => {
+                                    // 支付成功
+                                    uni.redirectTo({
+                                        url: 'order?type=paid'
+                                    })
+                                },
+                                cancel: () =>{
+                                    // 取消支付
+                                    uni.redirectTo({
+                                        url: 'order?type=unpay'
+                                    })
+                                }
+                            })
+                        })
+                    })
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                    if (!err.login) {
+                        uni.reLaunch({
+                            url: '/pages/draw/signin'
+                        });
+                    }
+                })
+            },
+            
+            /**
+             * 重要提示显示
+             */
+            pointMoreTap() {
+                this.pointMoreShow = !this.pointMoreShow
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #eeeeee;
+    }
+    
+    /* 权益内容 */
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 340rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            .classBack {
+                position: absolute;
+                    left: 28%;
+                    right: 30%;
+                    width: 44%;
+                    top: 40rpx;
+            }
+        }
+        .classCircle::after,
+        .contBack::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+        }
+        .classCircle::after {
+            left: 20%;
+            top: -20rpx;
+            width: 260rpx;
+            height: 260rpx;
+        }
+        .contBack::before {
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .welfareCont-top{
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                height: 120rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 40rpx;
+        box-sizing: border-box;
+        .rightsGoods-img {
+            width: 160rpx;
+            height: 160rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 60rpx 40rpx 0 230rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                font-size: 36rpx;
+                margin-bottom: 35rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 地址
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 40rpx;
+        color: #6c6c6c;
+        font-weight: 600;
+        font-size: 30rpx;
+    }
+    
+    .rightsLabel-left {
+        flex: 1;
+        color: #747d86;
+        .rightsLabel-row {
+            width: 42rpx;
+            height: 42rpx;
+        }
+    }
+    
+    .rightsLabel-range {
+        display: flex;
+        color: #000;
+        font-weight: 600;
+    }
+    
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 30rpx;
+            width: calc(100% - 60rpx);
+            height: 2rpx;
+            background-color: #bfbfbf;
+        }
+        &::after {
+            top: 0;
+        }
+        &::before {
+            bottom: 0;
+        }
+        .rightsLabel-row {
+            margin-top: 30rpx;
+        }
+        
+        .rightsLabel-icon {
+            width: 70rpx;
+            height: 70rpx;
+            margin-top: 14rpx;
+        }
+        .rightsLabel-right {
+            width: calc(100% - 80rpx);
+            margin-left: 10rpx;
+            display: flex;
+            font-size: 28rpx;
+            .rightsLabel-address-text {
+                flex: 1;
+                color: #000000;
+                .rightsLabel-address-name {
+                    display: flex;
+                    font-size: 32rpx;
+                    margin-bottom: 10rpx;
+                    .rightsLabel-address-tel {
+                        padding-left: 30rpx;
+                        color: #959595;
+                    }
+                }
+            }
+        }
+    }
+    .rightsLabel-row {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 0 0 0 6rpx;
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 30rpx 20rpx;
+        box-sizing: border-box;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+    .rightsPoint {
+        position: fixed;
+        left: 0;
+        bottom: 160rpx;
+        background: #eeeeee;
+        z-index: 9;
+        width: 100%;
+        padding: 20rpx 20rpx 10rpx;
+        box-sizing: border-box;
+    }
+    
+    .rightsPoint-cont {
+        width: 100%;
+        background: #eeeeee;
+        border-radius: 10rpx;
+        position: relative;
+        max-height: 50vh;
+        overflow-y: scroll;
+    }
+    
+    .rightsPoint-top {
+        font-size: 28rpx;
+        display: flex;
+        padding: 0 20rpx 20rpx;
+        box-sizing: border-box;
+        font-weight: 600;
+    }
+    
+    .rightsPoint-top image {
+        width: 36rpx;
+        height: 36rpx;
+        margin-right: 10rpx;
+    }
+    
+    .rightsPoint-text {
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        font-size: 24rpx;
+        line-height: 44rpx;
+        height: 90rpx;
+        transition: height 25s;
+        overflow: hidden;
+    }
+    
+    .rightsPoint-text.active {
+        height: auto;
+        transition: 2s;
+    }
+    
+    .rightsPoint-text view {
+        position: relative;
+        padding-left: 40rpx;
+    }
+    
+    .rightsPoint-text view::after {
+        position: absolute;
+        content: '';
+        left: 10rpx;
+        top: 20rpx;
+        background: #000;
+        width: 10rpx;
+        height: 10rpx;
+        border-radius: 50%;
+    }
+    
+    .rightsPoint-bolck {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: calc(100% - 40rpx);
+    }
+    
+    
+    .pointMore {
+        text-align: center;
+        width: 100%;
+        background: #eeeeee;
+        height: 80rpx;
+        line-height: 82rpx;
+        position: relative;
+        margin-top: 10rpx;
+    }
+    
+    .pointMore::after {
+        position: absolute;
+        content: '';
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 2rpx;
+        background: #f2ecde;
+    }
+    
+    .pointMore text {
+        font-size: 28rpx;
+        color: #c38e00;
+        animation: dong 1.8s infinite;
+        display: inline-block;
+    }
+    
+    .pointMore image {
+        width: 30rpx;
+        height: 30rpx;
+        margin-left: 4rpx;
+        vertical-align: -4rpx;
+        animation: dong 1.8s infinite;
+    }
+    @keyframes dong {
+        0% {
+            transform: translate(0px, 0px);
+        }
+    
+        50% {
+            transform: translate(0px, -6rpx);
+        }
+    
+        100% {
+            transform: translate(0px, 0px);
+        }
+    }
+</style>
diff --git a/pages/draw/setPassword.vue b/pages/draw/setPassword.vue
new file mode 100644
index 0000000..e36b9e4
--- /dev/null
+++ b/pages/draw/setPassword.vue
@@ -0,0 +1,111 @@
+<template>
+    <view class="content">
+        <image class="drawTitle" src="@/static/img/draw-title.png" mode="widthFix"></image>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+        		<view class="campus-inputs">
+        		    <image class="campus-form-icon" src="/static/img/draw_login_03.png" mode="aspectFill"></image>
+        		    <input class="campus-form-input" maxlength="6" type="password" placeholder="请设置登录密码" name="password" placeholder-style="color:#c9c9c9;"></input>
+        		</view>
+                <view class="campus-inputs">
+                    <image class="campus-form-icon" src="/static/img/draw_login_03.png" mode="aspectFill"></image>
+                    <input class="campus-form-input" maxlength="6" type="password" placeholder="请确认登录密码" name="newpassword" placeholder-style="color:#c9c9c9;"></input>
+                </view>
+        		<button class="campus-form-btn" form-type="submit">立即找回</button>
+            </form>
+        </view>
+        
+    </view>
+</template>
+
+<script>
+    import { passSetup } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+            }
+        },
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+        methods: {
+            // 立即登录
+            forgetlogin(e){
+                let newPass  = e.detail.value.newpassword || '',
+            		password = e.detail.value.password || ''
+            	passSetup({
+            		password: password,
+            		password_confirmation: newPass
+            	}).then(res => {
+            		uni.showToast({
+            			title: "密码重置成功",
+            			icon : 'none'
+            		})
+            		uni.reLaunch({
+            		    url: '/pages/draw/index'
+            		})
+            	}).catch(err =>{
+            		uni.showToast({
+            			title: err.message,
+            			icon : 'none'
+            		})
+            	})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	page {
+	    background-color: #f67b5a;
+	}
+	
+	.drawTitle {
+	    width: 100%;
+	}
+	
+	.campus-cont {
+	    padding: 10rpx 50rpx 0;
+	    box-sizing: border-box;
+	    .campus-inputs {
+	        background-color: #FFFFFF;
+	        border-radius: 10rpx;
+	        margin-bottom: 30rpx;
+	        height: 100rpx;
+	        line-height: 100rpx;
+	        display: flex;
+	        padding: 0 30rpx;
+	        box-sizing: border-box;
+	        .campus-form-icon {
+	            width: 50rpx;
+	            height: 50rpx;
+	            margin: 25rpx 20rpx 0 0;
+	        }
+	        .campus-form-input {
+	            width: calc(100% - 70rpx);
+	            height: 100%;
+	            line-height: 100rpx;
+	            font-size: 32rpx;
+	        }
+	    }
+	    .campus-form-btn {
+	        background-color: #ffe455;
+	        border-radius: 10rpx;
+	        line-height: 100rpx;
+	        font-size: 36rpx;
+	        color: #6a4902;
+	        margin-top: 40rpx;
+	        box-shadow: 4rpx 4rpx 6rpx #c62024;
+	    }
+	    .login-box {
+	        line-height: 90rpx;
+	        padding: 0 10rpx;
+	        box-sizing: border-box;
+	        color: #FFFFFF;
+	        font-size: 32rpx;
+	        text-align: center;
+	    }
+	}
+</style>
diff --git a/pages/draw/signin.vue b/pages/draw/signin.vue
new file mode 100644
index 0000000..da1a50c
--- /dev/null
+++ b/pages/draw/signin.vue
@@ -0,0 +1,125 @@
+<template>
+    <view class="content">
+        <image class="drawTitle" src="@/static/img/draw-title.png" mode="widthFix"></image>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/draw_login_02.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" maxlength="11" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile" placeholder-style="color:#c9c9c9;"></input>
+				</view>
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/draw_login_03.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" maxlength="6" type="password" placeholder="请输入登录密码" name="password" placeholder-style="color:#c9c9c9;"></input>
+				</view>
+				<view class="resPassword">
+				</view>
+				<button class="campus-form-btn" form-type="submit">立即登录</button>
+            </form>
+			<view class="login-box">
+				<navigator class="login-box-flex" hover-class="none" url="register">快速注册</navigator>
+                <navigator hover-class="none" url="password">忘记密码？</navigator>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { passlogin } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                mobileNo     : '',   // 手机号
+                disabled     : false,
+            }
+        },
+        
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+        
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+					password = e.detail.value.password || ''
+				passlogin({
+					mobile	: mobileNo,
+					password: password
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/draw/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	page {
+        background-color: #f67b5a;
+	}
+    
+    .drawTitle {
+        width: 100%;
+    }
+    
+    .campus-cont {
+        padding: 10rpx 50rpx 20rpx;
+        box-sizing: border-box;
+        .campus-inputs {
+            background-color: #FFFFFF;
+            border-radius: 10rpx;
+            margin-bottom: 30rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            .campus-form-icon {
+                width: 50rpx;
+                height: 50rpx;
+                margin: 25rpx 20rpx 0 0;
+            }
+            .campus-form-input {
+                width: calc(100% - 70rpx);
+                height: 100%;
+                line-height: 100rpx;
+                font-size: 32rpx;
+            }
+        }
+        .campus-form-btn {
+            background-color: #ffe455;
+            border-radius: 10rpx;
+            line-height: 100rpx;
+            font-size: 36rpx;
+            color: #6a4902;
+            margin-top: 40rpx;
+            box-shadow: 4rpx 4rpx 6rpx #c62024;
+        }
+        .login-box {
+            display: flex;
+            line-height: 90rpx;
+            padding: 0 10rpx;
+            box-sizing: border-box;
+            color: #FFFFFF;
+            font-size: 32rpx;
+            .login-box-flex {
+                flex: 1;
+            }
+        }
+    }
+</style>
diff --git a/pages/draw/success.vue b/pages/draw/success.vue
new file mode 100644
index 0000000..710c570
--- /dev/null
+++ b/pages/draw/success.vue
@@ -0,0 +1,74 @@
+<template>
+    <view class="content">
+        <view class="examine">
+            <image src="https://lifetest.ysd-bs.com/storage/materials/2022/09/26/pxdn3_03.png" mode="widthFix"></image>
+            <view class="text">
+                <view class="title">兑换成功</view>
+                <view class="time">管理员审核后,尽快给你发货,请您耐心等待</view>
+            </view>
+            <view @click="orderClick" class="return">我的订单</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {}
+        },
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-用户抽奖活动
+            getApp().globalData.envType = 'drawEnv'
+        },
+        methods: {
+            orderClick() {
+                uni.redirectTo({
+                    url: 'order?type=paid'
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #ffffff;
+    }
+    
+    .examine {
+        padding: 240rpx 0 30rpx;
+        box-sizing: border-box;
+        text-align: center;
+    }
+    
+    .examine image {
+        width: 80%;
+        margin: 0 auto 30rpx;
+    }
+    
+    .title {
+        font-weight: 600;
+        font-size: 42rpx;
+        margin-bottom: 30rpx;
+        color: #f33111;
+    }
+    
+    .time {
+        color: #999999;
+        line-height: 50rpx;
+    }
+    
+    .return {
+        font-size: 34rpx;
+        display: inline-block;
+        margin-top: 80rpx;
+        background-color: #f33111;
+        padding: 0 180rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+        border-radius: 10rpx;
+        box-shadow: 0 3rpx 6rpx 4rpx rgba(214, 6, 6, .6);
+        color: #FFFFFF;
+    }
+</style>
diff --git a/pages/favour/favour.vue b/pages/favour/favour.vue
new file mode 100644
index 0000000..ee30e3e
--- /dev/null
+++ b/pages/favour/favour.vue
@@ -0,0 +1,367 @@
+<template>
+    <view>
+        <view class="favourTitle">
+            <image class="favourTitle-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/favour_title.png" mode="widthFix"></image>
+        </view>
+        
+        <view class="favourBack" v-if="typeArr[typeIndex]">
+            <image class="favourBack-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/favour_back.png" mode="widthFix"></image>
+            <view class="favourBack-cont-title">我的{{ typeArr[typeIndex].value }}</view>
+            <view class="favourBack-cont">
+                <view class="favourBack-cont-name">{{ typeArr[typeIndex].value }}</view>
+                <view class="favourBack-cont-number">
+                    <text>{{ typeArr[typeIndex].key == 'silver' ? account.silver : account.drill }}</text>元
+                </view>
+            </view>
+        
+            <view class="favourCont">
+                <view class="favourBlack">
+                    <view class="favourCont-title">赠好友消费红包</view>
+                    <form @submit="formSubmit">
+                        <view class="favourCont-label">
+                            <view class="favourCont-name">账户类型</view>
+                            <picker class="favourCont-picker" :range="typeArr" :range-key="'value'" @change="typeBind">
+                                <view class="tabs-text">
+                                    {{ typeArr[typeIndex].value }}
+                                </view>
+                                <image src="/static/icon/rightsArrow.png"></image>
+                            </picker>
+                        </view>
+                        <view class="favourCont-label">
+                            <view class="favourCont-name">好友手机号</view>
+                            <view class="favourCont-check">
+                                <input type="number" @input="bindKeyInput" placeholder="输入好友手机号" />
+                                <view class="favourCont-check-btn" @tap="checkTel">校验号码</view>
+                            </view>
+                        </view>
+                        <view class="favourCont-label">
+                            <view class="favourCont-name">转账金额</view>
+                            <input type="digit" name="amount" placeholder="请输入转账金额" />
+                        </view>
+                        <view class="favourCont-label">
+                            <view class="favourCont-name">支付密码</view>
+                            <input type="number" name="paypass" placeholder="请输入支付密码" password />
+                        </view>
+                        <button class="favourCont-btn" formType="submit" :disabled="disabled">立即转入</button>
+                    </form>
+                </view>
+                <navigator class="favourCont-record" v-if="typeArr[typeIndex]" hover-class="none" :url="'/pages/account/account?type=' + typeArr[typeIndex].key"><text>赠予记录</text>
+                </navigator>
+            </view>
+        </view>
+        
+        <!-- 校验手机号弹出 -->
+        <view class="popTel-back" v-if="popShow"></view>
+        <view class="popTel" v-if="popShow">
+            <view class="popTel-title">当前转入的账户信息</view>
+            <view class="popTel-cont">
+                <image class="popTel-head" :src="userInfo.avatar"></image>
+                <view class="popTel-name">{{ userInfo.nickname }}</view>
+            </view>
+            <view class="popTel-btn" @tap="popHide">知道了</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { transfers, ajaxTel, transfersForm } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                account  : '', //账户积分
+                typeArr  : [], //转账类型
+                typeIndex: 0,  //转账下标
+                userInfo : '', //转账用户信息
+                mobile   : '',  //转账手机号
+                disabled : false, //支付按钮状态
+                popShow  : false  //校验弹出层
+    		}
+    	},
+        onLoad(options) {
+            // 获取账户下拉列表
+            this.accountList();
+        },
+        methods: {
+            // 账户下拉列表
+            accountList() {
+                transfers().then(res=>{
+                    this.account = res.account
+                    this.typeArr = res.accounts
+                }).catch(err=>{})
+            },
+        
+            // 账户下拉选择
+            typeBind(e) {
+                this.typeIndex = e.detail.value
+            },
+            
+            // 转入的手机号
+            bindKeyInput(val){
+                this.mobile = val.detail.value
+            },
+        
+            // 校验手机号码
+            checkTel() {
+                ajaxTel(this.mobile).then(res=>{
+                    this.userInfo = res
+                    this.popShow  = !this.popShow
+                }).catch(err=>{})
+            },
+        
+            // 关闭校验弹出
+            popHide() {
+                this.popShow = !this.popShow
+            },
+        
+            // 提交表单
+            formSubmit(e) {
+                // 检查用户登录状态
+                const Paypass = uni.getStorageSync("hasPaypass")
+                if(Paypass == false) {
+                    uni.showModal({
+                        title   : '提示',
+                        content : '抱歉，您还没有设置支付密码',
+                        success : res=> {
+                            if (res.confirm) {
+                                uni.navigateTo({
+                                    url: '/pages/payPassword/setup?source=favourUrl'
+                                })
+                            } else if (res.cancel) {}
+                        }
+                    })
+                    return
+                }
+                let newAmount  = e.detail.value.amount,
+                    newMobile  = this.mobile,
+                    newPaypass = e.detail.value.paypass,
+                    newType    = this.typeArr[this.typeIndex].key
+        
+                transfersForm({
+                    mobile: newMobile,
+                    type: newType,
+                    amount: newAmount,
+                    paypass: newPaypass
+                }).then(res=>{
+                    this.disabled = true
+                    uni.showToast({
+                        title: '转入成功',
+                    })
+                    setTimeout(()=>{
+                        uni.redirectTo({
+                            url: "/pages/account/account?type=" + newType
+                        })
+                    },2000)
+                }) .catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon:'none'
+                    })
+                })   
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #000000;
+    }
+    
+    .favourTitle {
+        text-align: center;
+        margin: 40rpx 0;
+    }
+    
+    .favourBack{
+        position: relative;
+        width: 100vw;
+    }
+    
+    .favourBack-img {
+        width: 100vw;
+        display: block;
+    }
+    
+    .favourBack-cont {
+        position: absolute;
+        top: 100rpx;
+        left: 0;
+        padding-left: 14%;
+        z-index: 1;
+        color: #606060;
+        width: 100%;
+        box-sizing: border-box;
+    }
+    
+    .favourBack-cont-number {
+        color: #000000;
+        width: 100%;
+        margin-top: 20rpx;
+        text {
+            font-size: 50rpx;
+            font-weight: 600;
+            padding-right: 10rpx;
+            display: inline-block;
+        }
+    }
+    
+    .favourBack-cont-title {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        text-align: center;
+        font-size: 26rpx;
+        line-height: 50rpx;
+    }
+    
+    .favourCont {
+        background-color: #ffffff;
+        padding: 40rpx 50rpx;
+        width: 100%;
+        box-sizing: border-box;
+        border-radius: 5rpx 5rpx 0 0;
+    }
+    
+    .favourBlack {
+        background-color: #e9e9e9;
+        padding: 40rpx;
+        box-sizing: border-box;
+        border-radius: 45rpx;
+    }
+    
+    .favourCont-record {
+        line-height: 90rpx;
+        text-align: center;
+        font-size: 34rpx;
+    }
+    
+    .favourCont-title {
+        font-size: 45rpx;
+        text-align: center;
+    }
+    
+    .favourCont-label {
+        display: flex;
+        margin-top: 40rpx;
+        font-size: 28rpx;
+        input {
+            font-size: 28rpx;
+        }
+    }
+    
+    .favourCont-check,
+    .favourCont-picker,
+    .favourCont-label>input {
+        background-color: #c9c9c9;
+        display: flex;
+        width: calc(100% - 160rpx);
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        height: 80rpx;
+        line-height: 80rpx;
+    }
+    
+    .favourCont-picker {
+        position: relative;
+        image {
+            width: 40rpx;
+            height: 40rpx;
+            position: absolute;
+            right: 0;
+            top: 20rpx;
+            z-index: 2;
+        }
+        input {
+            height: 80rpx;
+            line-height: 80rpx;
+        }
+    }
+    
+    .favourCont-check input,
+    .favourCont-picker input {
+        height: 80rpx;
+        line-height: 80rpx;
+    }
+    
+    .favourCont-name {
+        width: 160rpx;
+        line-height: 80rpx;
+    }
+    
+    
+    .favourCont-check-btn {
+        width: 150rpx;
+        text-align: center;
+        background-color: #a1a1a1;
+        line-height: 60rpx;
+        height: 60rpx;
+        margin-top: 10rpx;
+        font-size: 24rpx;
+    }
+    
+    .favourCont-btn {
+        width: 100% !important;
+        background-color: #dbc190;
+        margin-top: 40rpx;
+        border-radius: 60rpx;
+    }
+    
+    .tabs-text {
+        width: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        padding-left: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 校验弹出层 */
+    .popTel-back {
+        position: fixed;
+        left: 0;
+        top: 0;
+        background: rgba(0, 0, 0, .7);
+        width: 100vw;
+        height: 100vh;
+        z-index: 10;
+    }
+    
+    .popTel {
+        position: fixed;
+        left: 140rpx;
+        right: 140rpx;
+        top: 30%;
+        z-index: 11;
+        background-color: #fff;
+        border-radius: 20rpx;
+        text-align: center;
+        overflow: hidden;
+    }
+    
+    .popTel-title {
+        font-size: 32rpx;
+        background-color: #ff8e65;
+        color: #fff;
+        line-height: 80rpx;
+    }
+    
+    .popTel-cont {
+        padding: 60rpx 0;
+    }
+    
+    .popTel-head {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+        margin: 0 auto 20rpx;
+        border: #ff8e65 solid 2rpx;
+    }
+    
+    .popTel-btn {
+        border-top: 2rpx solid #dedede;
+        line-height: 90rpx;
+        color: #ff8e65;
+        font-size: 30rpx;
+    }
+</style>
diff --git a/pages/frozen/frozen.vue b/pages/frozen/frozen.vue
new file mode 100644
index 0000000..975c9f6
--- /dev/null
+++ b/pages/frozen/frozen.vue
@@ -0,0 +1,456 @@
+<template>
+    <view>
+        <view v-if="frozenData.length > 0">
+            <view class="grantSwiper">
+                <swiper class="banner-swiper" @change="monitorCurrent" :current="current">
+                    <swiper-item v-for="(item,index) in frozenData" :key="index">
+                        <view class="banner-height">
+                            <view class="grantTop">
+                                <image class="grantTop-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_back.png" mode="scaleToFill"></image>
+                                <view class="grantTop-text">
+                                    <image :src="type == 'silver' ? 'https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_identity_00.png' : 'https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_identity_01.png'"></image>
+                                    <view class="grantTop-price">
+                                        <text>待发放(额度)</text>
+                                        <view class="grantTop-price-tips">￥</view>{{ item.ungrant }}
+                                    </view>
+                                </view>
+                                <view class="grantTop-tips">
+                                    <view class="grantTop-time">发放周期 {{ item.cycle }}</view>
+                                    <view class="grantTop-number">共{{ item.num }}期</view>
+                                </view>
+                            </view>
+                            <view class="grantTitle">
+                                <view class="nowrap grantTitle-name">{{ item.source.remark }}</view>
+                                <view class="grantTitle-tel">{{ item.mobile }}</view>
+                            </view>
+                        </view>
+                        <view class="grantIssue">
+                            <view class="grantIssue-title">
+                                <view class="grantIssue-title-name">
+                                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_icon.png"></image><text>消费红包分期发放</text>
+                                </view>
+                                <view class="grantIssue-title-tips">
+                                    应发余额<text>￥{{ item.variable }}</text>，发放期数<text>{{ item.num }}</text>期，每期发放<text>￥{{ item.avg }}/期</text>
+                                </view>
+                            </view>
+                            <view class="grantIssue-list">
+                                <block v-if="item.items.length > 0">
+                                    <view class="grantIssue-label" v-for="(listItem,indexItem) in item.items" :key="indexItem">
+                                        <image class="grantIssue-label-img" :class="{active : listItem.status == 0}" src="https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_img.png" mode="scaleToFill"></image>
+                                        <view class="grantIssue-label-cont">
+                                            <view class="grantIssue-label-left">
+                                                <view class="grantIssue-left-top" :class="{active : listItem.status == 0}">
+                                                    第<text>{{listItem.num}}</text>期</view>
+                                                <view class="grantIssue-left-number" :class="{active : listItem.status == 0}">
+                                                    共<text>{{item.items.length}}</text>期</view>
+                                            </view>
+                                            <view class="grantIssue-label-center">
+                                                <view class="grantIssue-center-top" :class="{active : listItem.status == 0}">
+                                                    <text>{{listItem.variable}}</text>( 发放额度 )
+                                                </view>
+                                                <view class="grantIssue-center-time">发放时间：{{listItem.start_at}}</view>
+                                            </view>
+                                            <view class="grantIssue-label-right" :class="{active : listItem.status == 0}">
+                                                {{listItem.status_text}}
+                                            </view>
+                                        </view>
+                                        <image class="grantIssue-label-tips" :class="{active : listItem.status == 0}" src="https://card.ysd-bs.com/storage/materials/2021/09/01/frozen_btn.png" mode="scaleToFill">
+                                        </image>
+                                    </view>
+                                </block>
+                                <!-- 暂无内容 -->
+                                <view class="grantIssue-pack" v-else>
+                                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/Account_icon_tips.png"></image>
+                                    <view>抱歉，目前发放期数~</view>
+                                </view>
+                            </view>
+                        </view>
+                    </swiper-item>
+                </swiper>
+            </view>
+        
+            <view class="frozenArrow">
+                <view class="frozenArrow-left" v-if="current != 0">
+                    <image src="/static/icon/frozen_arrow.png"></image>
+                    返回上一个权益
+                </view>
+                <view class="frozenArrow-right" v-if="current == 0 || frozenData[frozenData.length - 1] > 0">
+                    <image src="/static/icon/frozen_arrow.png"></image>
+                    查看下一个权益
+                </view>
+            </view>
+        
+            <!-- 自定义轮播图进度点 -->
+            <view class="dots">
+                <block v-for="(item,index) in frozenData" :key="index">
+                    <view :class="{active : index == current}"></view>
+                </block>
+            </view>
+        </view>
+        <!-- 暂无内容 -->
+        <view class="no-pack-center pack-center pages-hint" wx:else>
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/Account_icon.png"></image>
+            <view>抱歉，目前暂无内容~</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { ungrants } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                current      : 0,  // 轮播标
+                type         : '', // 类型
+                frozenData   : [], // 数组列表
+                blockeds     : '', // 待发放金额
+            }
+        },
+        onLoad(options) {
+            this.type     = options.type,
+            this.blockeds = options.blockeds
+            
+            // 获取冻结列表
+            this.frozenInfo()
+        },
+        methods:{
+            // 冻结列表
+            frozenInfo() {
+                ungrants(this.type).then(res=>{
+                    this.frozenData = res
+                })
+            },
+            
+            // 轮播滑动
+            monitorCurrent(e) {
+                this.current = e.detail.current
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page,
+    .no-pack-center {
+        background-image: linear-gradient(to bottom, #24315d, #24315d);
+    }
+    .no-pack-center {
+        color: #fff;
+    }
+    .grantSwiper {
+        width: 100%;
+        height: 100vh;
+        padding: 0 40rpx;
+        box-sizing: border-box;
+        .banner-swiper {
+            height: 100vh;
+            overflow: hidden;
+            swiper-item {
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+            .banner-height {
+                height: 460rpx;
+                margin-top: 30rpx;
+                .grantTop {
+                    position: relative;
+                    width: 100%;
+                    height: 300rpx;
+                    color: #ffdf95;
+                    .grantTop-img {
+                        position: absolute;
+                        width: 100%;
+                        height: 100%;
+                        left: 0;
+                        top: 0;
+                    }
+                    .grantTop-text,
+                    .grantTop-tips {
+                        position: absolute;
+                        z-index: 9;
+                        left: 0;
+                        width: 100%;
+                    }
+                    .grantTop-text {
+                        top: 0;
+                        padding: 40rpx 60rpx;
+                        box-sizing: border-box;
+                        image {
+                            width: 120rpx;
+                            height: 40rpx;
+                        }
+                        .grantTop-price {
+                            text-align: center;
+                            font-size: 60rpx;
+                            text {
+                                font-size: 30rpx;
+                                display: block;
+                                color: #fff;
+                            }
+                            .grantTop-price-tips {
+                                display: inline-block;
+                                font-size: 40rpx;
+                            }
+                        }
+                    }
+                    .grantTop-tips {
+                        bottom: 0;
+                        font-size: 26rpx;
+                        display: flex;
+                        line-height: 70rpx;
+                        height: 70rpx;
+                        padding: 0 20rpx;
+                        box-sizing: border-box;
+                        .grantTop-time {
+                            flex: 1;
+                        }
+                    }
+                }
+                .grantTitle {
+                    background-color: #3d4963;
+                    border-radius: 15rpx;
+                    margin: 40rpx 0;
+                    width: 100%;
+                    display: flex;
+                    color: #d3d5e1;
+                    height: 90rpx;
+                    overflow: hidden;
+                    .grantTitle-name,
+                    .grantTitle-tel {
+                        box-sizing: border-box;
+                        height: 90rpx;
+                        line-height: 90rpx;
+                        font-size: 30rpx;
+                    }
+                    .grantTitle-name {
+                        padding-left: 20rpx;
+                        font-weight: 600;
+                        background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
+                        -webkit-background-clip:text;
+                        -webkit-text-fill-color:transparent;
+                        flex: 1;
+                    }
+                    .grantTitle-tel {
+                        padding: 0 30rpx 0 20rpx;
+                        background-color: #192845;
+                        position: relative;
+                        &::after {
+                            position: absolute;
+                            content: '';
+                            left: -20rpx;
+                            top: 0;
+                            width:0;
+                            height:0;
+                            border-left: 20rpx solid transparent;
+                            border-right: 20rpx solid transparent;
+                            border-bottom: 90rpx solid #192845;
+                        }
+                    }
+                }
+            }
+            .grantIssue {
+                height: calc(100vh - 550rpx);
+                .grantIssue-title {
+                    height: 120rpx;
+                    .grantIssue-title-name {
+                        line-height: 44rpx;
+                        display: flex;
+                        image {
+                            width: 42rpx;
+                            height: 42rpx;
+                            margin-right: 20rpx;
+                        }
+                        text {
+                            font-weight: 600;
+                            font-size: 32rpx;
+                            background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a);
+                            -webkit-background-clip:text;
+                            -webkit-text-fill-color:transparent;
+                        }
+                    }
+                    .grantIssue-title-tips {
+                        font-size: 26rpx;
+                        margin: 10rpx 0 30rpx;
+                        color: #d2d6e2;
+                        text {
+                            color: #dcbc8d;
+                        }
+                    }
+                }
+                .grantIssue-list {
+                    overflow-y: scroll;
+                    height: calc(100% - 140rpx);
+                    .grantIssue-label {
+                        position: relative;
+                        height: 180rpx;
+                        margin-bottom: 30rpx;
+                        border-radius: 10rpx;
+                        overflow: hidden;
+                        background-color: #f9dabb;
+                        .grantIssue-label-img {
+                            position: absolute;
+                            width: 100%;
+                            height: 100%;
+                            top: 0;
+                            left: 0;
+                        }
+                        .grantIssue-label-tips {
+                            position: absolute;
+                            width: 140rpx;
+                            height: 100%;
+                            right: 0;
+                            top: 0;
+                        }
+                        .grantIssue-label-img.active,
+                        .grantIssue-label-tips.active {
+                            -webkit-filter: grayscale(100%);   
+                            -moz-filter: grayscale(100%);  
+                            -ms-filter: grayscale(100%);   
+                            -o-filter: grayscale(100%);     
+                            filter: grayscale(100%); 	     
+                            filter: gray;
+                        }
+                        .grantIssue-label-cont {
+                            position: absolute;
+                            width: 100%;
+                            height: 100%;
+                            left: 0;
+                            top: 0;
+                            z-index: 6;
+                            padding: 20rpx;
+                            box-sizing: border-box;
+                            display: flex;
+                            .grantIssue-label-left {
+                                width: 120rpx;
+                                text-align: center;
+                                margin-top: 20rpx;
+                                .grantIssue-left-top {
+                                    color: #e9083d;
+                                    font-size: 26rpx;
+                                    text {
+                                        font-size: 34rpx;
+                                        font-weight: 600;
+                                        padding: 0 6rpx;
+                                    }
+                                }
+                                .grantIssue-left-number {
+                                    background:-webkit-linear-gradient(left,#ffdca4,#f8af52);
+                                    color: #b13509;
+                                    border-radius: 30rpx;
+                                    display: inline-block;
+                                    font-size: 22rpx;
+                                    height: 42rpx;
+                                    line-height: 42rpx;
+                                    padding: 0 15rpx;
+                                    margin-top: 12rpx;
+                                    &.active {
+                                        background: -webkit-linear-gradient(left,#e2e2e2,#e2e2e2);
+                                        color: gray;
+                                    }
+                                }
+                            }
+                            .grantIssue-label-center {
+                                width: calc(100% - 240rpx);
+                                margin: 20rpx 20rpx 0 20rpx;
+                                .grantIssue-center-top {
+                                    font-size: 26rpx;
+                                    color: #0f004a;
+                                    font-weight: 600;
+                                    margin-bottom: 8rpx;
+                                    text {
+                                        font-size: 40rpx;
+                                        padding-right: 10rpx;
+                                    }
+                                }
+                                .grantIssue-center-time {
+                                    font-size: 26rpx;
+                                    color: #757575;
+                                }
+                            }
+                            .grantIssue-label-right {
+                                width: 80rpx;
+                                font-weight: 600;
+                                text-align: center;
+                                font-size: 26rpx;
+                                color: #3d2a26;
+                                line-height: 140rpx;
+                            }
+                            .grantIssue-left-top.active,
+                            .grantIssue-center-top.active,
+                            .grantIssue-label-right.active {
+                                color: gray;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    // 滑动箭头
+    .frozenArrow-left,
+    .frozenArrow-right {
+        position: fixed;
+        z-index: 9;
+        top: 35%;
+        width: 40rpx;
+        height: 40rpx;
+        text-align: center;
+        writing-mode:lr-tb;
+        color: #f0cba8;
+        font-size: 24rpx;
+    }
+    .frozenArrow-left {
+        left: 8rpx;
+        -webkit-animation: bounce-left 1s linear infinite;
+        animation: bounce-left 1s linear infinite;
+        image {
+            transform:rotate(180deg);
+            -moz-transform:rotate(180deg);
+            -webkit-transform:rotate(180deg);
+        }
+    }
+    .frozenArrow-right {
+        right: 8rpx;
+        -webkit-animation: bounce-right 1s linear infinite;
+        animation: bounce-right 1s linear infinite;
+    }
+    @keyframes bounce-left {
+        25% {transform: translateX(3px);}
+        50%, 100% {transform: translateX(0);}
+        75% {transform: translateX(-3px);}
+    }
+    @keyframes bounce-right {
+        25% {transform: translateX(-3px);}
+        50%, 100% {transform: translateX(0);}
+        75% {transform: translateX(3px);}
+    }
+    .frozenArrow-left image,
+    .frozenArrow-right image {
+        width: 24rpx;
+        height: 24rpx;
+    }
+    
+    // 指示点
+    .dots {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+        position: fixed;
+        bottom: 20rpx;
+        height: 40rpx;
+        view {
+            width: 14rpx;
+            height: 14rpx;
+            margin: 0 6rpx;
+            border-radius: 50%;
+            background-color: #c5c5c5;
+            &.active {
+                width: 24rpx;
+                border-radius: 40rpx;
+                background-color: #ffdf95;
+            }
+        }
+    }
+</style>
diff --git a/pages/giftPack/buy.vue b/pages/giftPack/buy.vue
new file mode 100644
index 0000000..a9b2a57
--- /dev/null
+++ b/pages/giftPack/buy.vue
@@ -0,0 +1,825 @@
+<template>
+    <view>
+        <!-- 按钮 -->
+        <view class="newrightsBtn" @tap="judgeGeneral">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ rightData.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ rightData.total }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 卡券 -->
+        <view style="padding-bottom: 240px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png" mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+                                <image :src="item" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                        <view class="nowrap rightsCont-btn">
+                            {{ rightData.detail.four_title }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.five_title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{ rightData.detail.price }}</view>
+                        <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" @click="goodsNumber('plus')">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+			
+			<!-- 金额 -->
+			<view class="rightsList" v-if="rightData.detail">
+			    <view class="rightsLabel">
+			        <view class="rightsLabel-left">{{ rightData.detail.attribute.form_type }}</view>
+			        <view class="rightsLabel-right rightsLabel-red">-￥{{ rightData.detail.score }}</view>
+			    </view>
+			</view>
+            
+            <!-- 收货地址 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                    <block v-if="rightData.detail.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="/static/img/new_rightsAddress.png"></image>
+                            <block v-if="rightData.addressSee != ''">
+                                <view class="rightsLabel-right" @tap="addressTap">
+                                    <view class="rightsLabel-address-text">
+                                        <view class="rightsLabel-address-name">{{ rightData.addressSee.name }}<view class="rightsLabel-address-tel">{{ rightData.addressSee.mobile }}</view></view>
+                                        <text class="nowrap">{{ rightData.addressSee.all_address }}</text>
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                    <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                        添加收货地址
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </navigator>
+                            </block>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right rightsLabel-freight">￥{{ rightData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <view class="noticeText-top">购买须知</view>
+                    <view class="noticeText-cont" v-if="notice.remark">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+                    
+                    <view class="noticeText-top">内容介绍</view>
+                    <view class="noticeText-cont" v-if="notice.content">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+			
+			<!-- 重要提示 -->
+			<view class="rightsPoint">
+				<view class="rightsPoint-cont">
+					<view class="rightsPoint-top">
+						<image src="/static/icon/Point_icon.png"></image>
+						<text>重要提示</text>
+					</view>
+					<view class="rightsPoint-text" :class="{active : notes.pointMoreShow}">
+						<rich-text :nodes="notes.notification"></rich-text>
+					</view>
+					<view class="pointMore" @click="pointMoreTap">
+						<text>{{ notes.pointMoreShow == true ? '收起' : '展开' }}</text>
+						<image :src="notes.pointMoreShow == true ? '/static/img/pointMore-up.png' : '/static/img/pointMore.png'">
+						</image>
+					</view>
+				</view>
+			</view>
+			
+			
+        </view>
+    </view>
+</template>
+
+<script>
+    import { buy, buySubmit } from '@/apis/interfaces/giftPack'
+    export default {
+        data() {
+            return {
+                rightData: {
+                    detail      : '',  // 权益内容
+                    rightId     : '',  // 权益id
+                    addressSee  : '',  // 收货地址
+                    num         : 1,   // 购买数量
+                    moreAmount  : '',  // 产品总金额
+                    freight     : '',  // 运费
+                    total       : ''   // 总金额
+                },
+                notice          : {
+                    remark      : '',     // 购买须知
+                    content     : '',     // 内容介绍
+                    noticeShow  : true   // 购买须知状态
+                },
+                buyWay          : {
+                    platformCp  : [],  // 选择提交数组
+                    platIndex   : 0,   // 选择提交方式下标
+                    isdeliver   : -1   // 选择提交方式
+                },
+                address         : {
+                    allAddress  : [],      // 收货地址列表
+                    addressShow : false    // 地址显示状态
+                },
+				notes         : {
+				    notification  : '',  // 重要提示-内容
+				    pointMoreShow : false// 重要提示-展开收起
+				},
+                disabled        : false,   //购买按钮状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.rightData.rightId = options.id
+            // this.code    = options.code || ''
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-月兑活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                buy({activity_month_id: this.rightData.rightId, qty: this.rightData.num}).then(res => {
+                    let obj    = res.detail.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.def_get
+                        }
+                        if(res.detail.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+					this.notes.notification   = res.detail.notification.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/giftPack/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.rightData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.rightData.num = num
+                    
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+			
+			// 重要提示展开-收起
+			pointMoreTap() {
+			    this.notes.pointMoreShow = !this.notes.pointMoreShow
+			},
+			
+			// 收银台跳转
+			judgeGeneral(){
+				if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.rightData.detail.def_get
+				    
+				buySubmit({activity_month_id: this.rightData.rightId, qty: this.rightData.num, is_deliver: this.buyWay.isdeliver}).then(res => {
+					if(res.can_pay) {
+						uni.navigateTo({
+						    url: '/pages/cashier/index?tradeNo=' + res.trade_no + '&type=giftPEnv' + "&activity_type=right" + '&price=' + this.rightData.moreAmount
+						})
+						return
+					}
+					
+					uni.showToast({
+					    title   : '购买成功',
+					    icon    : 'none'
+					})
+				    setTimeout(()=>{
+				        uni.reLaunch({
+				            url: '/pages/giftPack/index'
+				        })
+				    },3000)
+					
+				}).catch(err => {
+					uni.showToast({
+					    title   : err.message,
+					    icon    : 'none'
+					})
+				});
+			},
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #FFFFFF;
+    }
+    
+    /* 权益内容 */
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 340rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            .classBack {
+                position: absolute;
+                left: 28%;
+                right: 30%;
+                width: 44%;
+                top: 40rpx;
+            }
+        }
+        .classCircle::after,
+        .contBack::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+        }
+        .classCircle::after {
+            left: 20%;
+            top: -20rpx;
+            width: 260rpx;
+            height: 260rpx;
+        }
+        .contBack::before {
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .welfareCont-top{
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                height: 120rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+	
+	.rightsList {
+		border-top: 22rpx #eeeeee solid;
+	}
+    
+    // 地址
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 40rpx;
+        color: #6c6c6c;
+        font-weight: 600;
+        font-size: 30rpx;
+    }
+    
+    .rightsLabel-left {
+        flex: 1;
+        color: #747d86;
+        .rightsLabel-row {
+            width: 42rpx;
+            height: 42rpx;
+        }
+    }
+    
+    .rightsLabel-range {
+        display: flex;
+        color: #000;
+        font-weight: 600;
+    }
+    
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 30rpx;
+            width: calc(100% - 60rpx);
+            height: 2rpx;
+            background-color: #bfbfbf;
+        }
+        &::after {
+            top: 0;
+        }
+        &::before {
+            bottom: 0;
+        }
+        .rightsLabel-row {
+            margin-top: 30rpx;
+        }
+        
+        .rightsLabel-icon {
+            width: 70rpx;
+            height: 70rpx;
+            margin-top: 14rpx;
+        }
+        .rightsLabel-right {
+            width: calc(100% - 80rpx);
+            margin-left: 10rpx;
+            display: flex;
+            font-size: 28rpx;
+            .rightsLabel-address-text {
+                flex: 1;
+                color: #000000;
+                .rightsLabel-address-name {
+                    display: flex;
+                    font-size: 32rpx;
+                    margin-bottom: 10rpx;
+                    .rightsLabel-address-tel {
+                        padding-left: 30rpx;
+                        color: #959595;
+                    }
+                }
+            }
+        }
+    }
+	
+	.rightsLabel-red {
+		color: #ff5b5d;
+	}
+    .rightsLabel-row {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 0 0 0 6rpx;
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        border-top: 20rpx #eeeeee solid;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+	
+	/* 重要提示 */
+	.rightsPoint {
+	    position: fixed;
+	    left: 0;
+	    bottom: 160rpx;
+	    background: #eeeeee;
+	    z-index: 9;
+	    width: 100%;
+	    padding: 20rpx 20rpx 10rpx;
+	    box-sizing: border-box;
+	    .rightsPoint-cont {
+	        width: 100%;
+	        background: #eeeeee;
+	        border-radius: 10rpx;
+	        position: relative;
+	        max-height: 50vh;
+	        overflow-y: scroll;
+	        .rightsPoint-top {
+	            font-size: 28rpx;
+	            display: flex;
+	            padding: 0 20rpx 20rpx;
+	            box-sizing: border-box;
+	            font-weight: 600;
+	            image {
+	                width: 36rpx;
+	                height: 36rpx;
+	                margin-right: 10rpx;
+	            }
+	        }
+	        .rightsPoint-text {
+	            padding: 0 20rpx;
+	            box-sizing: border-box;
+	            font-size: 24rpx;
+	            line-height: 44rpx;
+	            height: 90rpx;
+	            transition: height 25s;
+	            overflow: hidden;
+	            &.active {
+	                height: auto;
+	                transition: 2s;
+	            }
+	        }
+	        .pointMore {
+	            text-align: center;
+	            width: 100%;
+	            background: #eeeeee;
+	            height: 80rpx;
+	            line-height: 82rpx;
+	            position: relative;
+	            margin-top: 10rpx;
+	            &::after {
+	                position: absolute;
+	                content: '';
+	                left: 0;
+	                top: 0;
+	                width: 100%;
+	                height: 2rpx;
+	                background: #f2ecde;
+	            }
+	            text {
+	                font-size: 28rpx;
+	                color: #c38e00;
+	                animation: dong 1.8s infinite;
+	                display: inline-block;
+	            }
+	            image {
+	                width: 30rpx;
+	                height: 30rpx;
+	                margin-left: 4rpx;
+	                vertical-align: -4rpx;
+	                animation: dong 1.8s infinite;
+	            }
+	            @keyframes dong {
+	                0% {
+	                    transform: translate(0px, 0px);
+	                }
+	            
+	                50% {
+	                    transform: translate(0px, -6rpx);
+	                }
+	            
+	                100% {
+	                    transform: translate(0px, 0px);
+	                }
+	            }
+	            &::after {
+	                position: absolute;
+	                content: '';
+	                left: 0;
+	                top: 0;
+	                width: 100%;
+	                height: 2rpx;
+	                background: #f2ecde;
+	            }
+	        }
+	    }
+	}
+</style>
diff --git a/pages/giftPack/details.vue b/pages/giftPack/details.vue
new file mode 100644
index 0000000..c9d81d9
--- /dev/null
+++ b/pages/giftPack/details.vue
@@ -0,0 +1,600 @@
+<template>
+    <view class="content">
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ details.startTime }} - {{ details.endTime }}
+        		</view>
+        	</view>
+        	<view class="detailsCotent">
+        	    <view class="source">活动来源 ： {{ details.activity_name }}</view>
+        	    <view class="detailsBar">
+        	    	<view class="detailsCode-text">劵码</view>
+        	    	<image :src="barcode" mode="widthFix"></image>
+        	    </view>
+        	    <view class="detailsCode-text">
+        	    	{{ details.code }}
+        	    </view>
+        	    <view class="detailsCode">
+        	    	<image :src="qrcode" @click="refreshCode"></image>
+        	    	<view class="detailsCode-text">
+        	    		<text>请出示以上券码给网点工作人员</text>
+        	    	</view>
+        	    </view>
+                <view class="petroNew" v-if="details.right">
+                    <view class="petroNew-btn" v-if="details.right.from == 'petroNew'" @click="urlFrom">
+                        去使用
+                    </view>
+                </view>
+                
+                <!-- 门店定位 -->
+                <view class="detailsStore">
+                	<view class="detailsStore-top">
+                		<view class="detailsStore-title">
+                			适用门店
+                		</view>
+                		<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + details.id + '&type=campus'" v-if="longitude != 0 && latitude != 0">
+                			查看所有
+                			<image src="/static/icon/arrow_left.png"></image>
+                		</navigator>
+                	</view>
+                	<view class="location" v-if="longitude == 0 && latitude == 0">
+                		<image class="location-img" src="/static/img/location_img.jpg"></image>
+                		<text>您尚未授权本时生活开启定位服务</text>
+                		<text>不能看到附近的商家哦，点击下方按钮开启</text>
+                		<button class="location-btn" size="mini" open-type="openSetting">
+                			开启定位服务
+                		</button>
+                	</view>
+                	<view v-else>
+                		<block v-if="stores.length > 0">
+                			<view class="detailsStore-list" :data-id="(item.store_id)" v-for="(item, index) in stores" :key="index"
+                				@tap="detailsTap">
+                				<image :src="item.cover" class="detailsStore-logo"></image>
+                				<view class="detailsStore-cont">
+                					<view class="detailsStore-left">
+                						<view class="nowrap detailsStore-name">
+                							{{ item.title }}
+                						</view>
+                						<view class="detailsStore-place">
+                							<text class="nowrap">{{ item.address }}</text>
+                							{{ item.km }}
+                						</view>
+                					</view>
+                					<image class="detailsStore-tel" src="/static/icon/tel.png" @tap.stop="tel"
+                						:data-tel="(item.mobile)"></image>
+                				</view>
+                			</view>
+                		</block>
+                		<block v-else>
+                			<view class="pages-hint">
+                				<image src="/static/img/null_icon.png"></image>
+                				<view>暂无门店</view>
+                			</view>
+                		</block>
+                	</view>
+                </view>
+        	</view>
+            <!-- 使用须知 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		使用须知
+            	</view>
+            	<view class="detailsText-tips">
+            		<rich-text :nodes="remark"></rich-text>
+            	</view>
+            </view>
+            
+            <!-- 内容介绍 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		内容介绍
+            	</view>
+            	<view class="detailsText-tips" v-if="content != null">
+            		<rich-text :nodes="content"></rich-text>
+            	</view>
+            </view>
+        </view>
+        
+        <!-- 底部 -->
+        <view class="detailsBottom">
+            <image src="/static/img/campus_details_back.png" mode="aspectFill"></image>
+            <view class="detailsBottom-cont">
+                <view class="detailsBottom-title">
+                    月兑活动
+                </view>
+                亿时代 - 本时生活
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { qrcode, barcode, couponinfo, merchantCard, breakCode } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                id          : 0,        //优惠券id
+                longitude   : 0,        //经度
+                latitude    : 0,        //纬度
+                details     : '',       //优惠券信息
+                stores      : [],       //商家列表
+                content     : '',       //内容介绍
+                remark      : '',       //使用须知
+                qrcode      : '',       //二维码
+                barcode     : '',       //条形码
+                merchantcardinfo:''     //商家券信息
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 优惠券id
+            this.id = options.id
+    
+            // 获取二维码
+            qrcode(options.id).then(res=>{
+                this.qrcode = res.qrcode
+            })
+            
+            // 获取条形码
+            barcode(options.id).then(res=>{
+                this.barcode = res.barcode
+            })
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 获取详情信息
+            this.detailsInfo();
+			
+            // 存储环境-月兑活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+            // 获取定位信息
+            uni.getLocation({
+                success: res => {
+                    this.latitude   = res.latitude
+                    this.longitude  = res.longitude
+                },
+                complete: () => {
+                    // 获取详情信息
+                    this.detailsInfo();
+                }
+            })
+        },
+        methods: {
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.id,
+                    user_lng: this.longitude,
+                    user_lat: this.latitude
+                }).then(res=>{
+                    console.log(res)
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.details = res.info
+                    this.stores  = stores
+                    this.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    //获取商家券信息
+                    if(res.info.card_type=='merchant_card'){
+                        this.getMerchantCardInfo()
+                    }
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/giftPack/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商家券信息
+            getMerchantCardInfo(){
+                merchantCard(this.id).then(res=>{
+                   this.merchantcardinfo  = res
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/giftPack/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 拨打电话
+            tel(e) {
+                let tel = e.currentTarget.dataset.tel
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                    url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat + '&type=campus'
+                })
+            },
+            
+            // 刷新二维码
+            refreshCode() {
+                breakCode(this.id).then(res=>{
+                    uni.showToast({
+                    	title: '刷新中',
+                    	duration: 1000,
+                        icon:'loading'
+                    });
+                   this.qrcode = res.qrcode
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/giftPack/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            urlFrom () {
+                // #ifdef H5
+                window.location.href = "https://cloud1-0g37c0kwb91b41c8-1305411715.tcloudbaseapp.com/"
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    .content {
+        background: #cbaf7f;
+        padding: 20rpx;
+        box-sizing: border-box;
+		height: 100%;
+		overflow-y: scroll;
+    }
+    
+    /* 卡券详情 */
+    .details {
+        background: #ffffff;
+        margin: 20rpx 20rpx 0;
+        width: calc(100% - 40rpx);
+        position: relative;
+        border-radius: 0 0 20rpx 20rpx;
+        border-bottom: 240rpx solid transparent;
+        box-sizing: border-box;
+    }
+    
+    .details::after,
+    .details::before {
+        position: absolute;
+        background: #cbaf7f;
+        content: '';
+        top: -50rpx;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    
+    .details::after {
+        left: -50rpx;
+    }
+    
+    .details::before {
+        right: -50rpx;
+    }
+    
+    .detailsCotent {
+        padding: 40rpx;
+        box-sizing: border-box;
+		box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+    }
+    
+    .detailsTop {
+        border-bottom: 2rpx dashed #c8c8c8;
+        padding: 40rpx 0;
+        text-align: center;
+        box-sizing: border-box;
+        background-color: #f5f5f5;
+    }
+    
+    .detailsTop-name {
+        font-size: 38rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        padding: 0 60rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop-time {
+        color: #7e7e7e;
+        font-size: 26rpx;
+    }
+    
+    .detailsCode {
+        text-align: center;
+        padding: 0 0 20rpx;
+        box-sizing: border-box;
+        margin: 40rpx 0 20rpx;
+    }
+    
+    .detailsCode image {
+        width: 300rpx;
+        height: 300rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    
+    .detailsCode-text {
+        text-align: center;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #000;
+    }
+    
+    .detailsCode-text text {
+        color: #999;
+        font-weight: normal;
+        font-size: 26rpx;
+    }
+    
+    .detailsStore {
+        border-top: 2rpx #c8c8c8 solid;
+        padding-top: 40rpx;
+    }
+    
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 130rpx;
+        top: 0;
+        width: calc(100% - 130rpx);
+        display: flex;
+    }
+    
+    .detailsStore-left {
+        width: calc(100% - 90rpx);
+        margin-right: 30rpx;
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+        border-top: 2rpx solid #ececec;
+    }
+    
+    .detailsText-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText-tips {
+        font-size: 26rpx;
+        line-height: 50rpx;
+        color: #555557;
+        padding-bottom: 20rpx;
+    }
+    
+    .detailsCode-join {
+        color: #ee8e44;
+        font-size: 24rpx;
+        border-radius: 50rpx;
+        border: 2rpx solid #ee8e44;
+        padding: 10rpx 20rpx;
+        display: inline-block;
+        margin-top: 30rpx;
+    }
+    
+    .detailsCode-join.active {
+        border: 2rpx solid #999;
+        color: #999;
+    }
+    
+    .source{ 
+        margin: 30rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .location {
+        background: white;
+        width: 100%;
+        text-align: center;
+        margin: 60rpx 0 0;
+    }
+    
+    .location text {
+        font-size: 28rpx;
+        display: block;
+        line-height: 46rpx;
+        color: #999;
+    }
+    
+    .location-btn[size="mini"] {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 66rpx;
+        margin-top: 30rpx;
+    }
+    
+    .location-img {
+        width: 150rpx;
+        height: 120rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsBar {
+        text-align: center;
+        padding: 0 50rpx;
+        box-sizing: border-box;
+        margin-top: 60rpx;
+        margin-bottom: 40rpx;
+    }
+    
+    
+    .detailsBar image {
+        width: 100%;
+    }
+    
+    .detailsBar .detailsCode-text {
+        margin-bottom: 10px;
+        color: #000;
+    }
+    
+    .detailsBottom {
+        position: fixed;
+        width: 100%;
+        height: 220rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 9;
+    }
+    .detailsBottom image {
+         width: 100%;
+         height: 100%;
+         position: absolute;
+         left: 0;
+         top: 0;
+    }
+    
+    .detailsBottom-cont {
+        z-index: 10;
+        position: absolute;
+        left: 0;
+        top: 70rpx;
+        width: 100%;
+        text-align: center;
+        color: #9a9a9a;
+        font-size: 26rpx;
+    }
+    
+    .detailsBottom-title {
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        font-size: 30rpx;
+    }
+    
+    .petroNew {
+        text-align: center;
+    }
+    .petroNew-btn {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 72rpx;
+        border-radius: 6rpx;
+        margin: 0 auto 50rpx;
+        text-align: center;
+        width: 50%;
+    }
+</style>
diff --git a/pages/giftPack/index-首页仰视备份.vue b/pages/giftPack/index-首页仰视备份.vue
new file mode 100644
index 0000000..2c9d5c1
--- /dev/null
+++ b/pages/giftPack/index-首页仰视备份.vue
@@ -0,0 +1,474 @@
+<template>
+    <view class="content">
+        <view class="content-border">
+        	<view v-for="(item, idx) in adverts" :key="item.cover">
+        	    <image class="campusBanner" :src="item.cover" mode="widthFix"></image>
+        	</view>
+        	<view class="recommend"></view>
+        	<!-- tab -->
+        	<view class="indexTab">
+        	    <view class="indexTab-item" :class="{active : tabType == item.used}" @tap="orderTab" v-for="(item, index) in tabList" :key="index" :data-state="(item.used)">
+        			<view class="indexTab-title">
+        				 {{ item.title }}
+        			</view>
+        			<view class="indexTab-number">
+						<block v-if="isUser">({{item.used == 0 ? '剩余' + numbers + '次' : count + '张'}})</block>
+        			</view>
+        	    </view>
+        	</view>
+        	
+			<!-- 可兑换 -->
+			<block v-if="tabType == 0">
+				<block v-if="giftPackArr.length > 0">
+					<navigator class="film" v-for="(item, index) in giftPackArr" :key="index" hover-class="none" :url="'/pages/giftPack/list?id=' + item.activity_month_category_id">
+						<view class="film-back" :style="{ backgroundImage: 'url(' + item.cover + ')' }">
+							<view class="film-title">{{item.title}}</view>
+							<view class="film-btn">去兑换</view>
+						</view>
+					</navigator>
+				</block>
+				<!-- 列表为空 -->
+				<view class="campusTips" v-else>
+				    <view class="campusTips-cont">
+				    	<image src="/static/img/giftPack-null.png" mode="aspectFill"></image>
+				    	<view>暂无可兑换的卡券</view>
+				    </view>
+				</view>
+			</block>
+			
+			<!-- 已兑换 -->
+			<block v-if="tabType == 1">
+				<view class="" v-if="isUser">
+					<block v-if="couponArr.length > 0">
+						<view class="coupon" v-for="(item, index) in couponArr" :key="index">
+							<view class="couponItem">
+								<view class="couponItem-cont">
+									<view class="couponItem-top">
+										<view class="couponItem-cont-number">
+											￥<text>{{item.price}}</text>
+										</view>
+									   <view class="couponItem-cont-name">
+											<view class="couponItem-cont-title">
+												{{item.name}}
+											</view>
+											<view class="couponItem-cont-show" @click="moreCoupon(index)">
+												详细信息<image src="/static/icon/giftPack-icon.png" class="couponItem-cont-icon" :class="{active: item.couponShow }" mode="aspectFill"></image>
+											</view>
+										</view>
+									</view>
+									<navigator class="couponItem-btn" hover-class="none" :url="'/pages/giftPack/details?id=' + item.id">
+										立即使用
+									</navigator>
+								</view>
+								<view class="couponItem-cont-text" v-if="item.couponShow">
+									<rich-text :nodes="item.remark"></rich-text>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 列表为空 -->
+					<view class="campusTips" v-else>
+					    <view class="campusTips-cont">
+					    	<image src="/static/img/giftPack-null.png"></image>
+					    	<view>可使用的卡券暂时没有啦~</view>
+							<navigator hover-class="none" url="/pages/giftPack/myCoupon" class="campusTips-cont-go">我的优惠券</navigator>
+					    </view>
+					</view>
+				</view>
+				<view class="campusTips" v-else>
+				    <view class="campusTips-cont">
+				    	<image src="/static/img/giftPack-null.png"></image>
+				    	<view>请您先登录，进行优惠券查看~</view>
+						<navigator hover-class="none" url="/pages/giftPack/signin" class="campusTips-cont-go">立即登录</navigator>
+				    </view>
+				</view>
+			</block>
+        </view>
+		
+        <!-- 按钮 -->
+		<view class="campusBtn">
+			<navigator url="/pages/giftPack/index" hover-class="none" class="campusBtn-go active">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user00_active.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					活动首页
+				</view>
+			</navigator>
+			<navigator url="/pages/giftPack/user" hover-class="none" class="campusBtn-go">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user01.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					个人中心
+				</view>
+			</navigator>
+		</view>
+    </view>
+</template>
+
+<script>
+    import { index, coupon } from '@/apis/interfaces/giftPack'
+    export default {
+        data() {
+            return {
+				isUser      : false,  // 用户是否登录
+				giftPackArr : [],
+                adverts     : [],
+				couponArr   : [],
+				numbers     : '',
+				count       : '',
+				
+				//Tab列表
+				tabList     : [
+				    { title : "可兑换", used: 0 },
+				    { title : "已兑换", used: 1 }
+				],
+				tabType     : 0, //卡券状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-月兑活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+			if(uni.getStorageSync("token")) {
+				this.isUser = true
+			}
+			
+			// 获取首页数据
+			this.indexInfo()
+			
+        },
+        methods: {
+            // 首页数据
+            indexInfo() {
+				if(this.tabType == 0) {
+					// 获取首页数据
+					index().then(res=>{
+						this.giftPackArr = res.categories
+						this.numbers     = res.numbers
+						this.count       = res.coupons_count
+						this.adverts     = res.adverts
+					}).catch(err=>{})
+				} else {
+					if(uni.getStorageSync("token")) {
+						// 获取优惠券数据
+						coupon().then(res=>{
+							var listData = res.data 
+							for(let val in listData){
+								listData[val].couponShow = false
+							}
+							this.couponArr = listData
+						}).catch(err=>{})
+					}
+					
+				}
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/giftPack/signin'
+                })
+            },
+			
+			// tabs 选项卡
+			orderTab(e){
+				let state = e.currentTarget.dataset.state
+				this.tabType = state
+				
+				// 获取首页数据
+				this.indexInfo();
+			},
+			
+			// 可兑换信息展开
+			moreClick(index) {
+				this.giftPackArr[index].schemesShow = !this.giftPackArr[index].schemesShow
+			},
+			
+			// 已兑换细信息展开
+			moreCoupon(index) {
+				this.couponArr[index].couponShow = !this.couponArr[index].couponShow
+			},
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .content {
+        background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        padding-bottom: 40rpx;
+		height: 100vh;
+		overflow-y: scroll;
+		box-sizing:  border-box
+    }
+	.content-border {
+		border-bottom: 130rpx transparent solid;
+	}
+    
+    // banner
+    .campusBanner {
+        width: 100%;
+    }
+    
+    // 推荐
+    .recommend {
+        overflow: hidden;
+        margin-top: -60rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        .recommend-label {
+            text-align: center;
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx 30rpx;
+            .recommend-label-img {
+                width: 150rpx;
+                height: 150rpx;
+                margin: 0 auto 10rpx;
+                background: linear-gradient(to bottom, #293350, #484e74);
+                box-shadow: 0px 8px 6px rgba(249,228,129,.5);
+                border-radius: 50%;
+                box-sizing: border-box;
+                image {
+                    width: 80rpx;
                    height: 80rpx;
+                    margin: 35rpx;
+                }
+            }
+            .recommend-label-text {
+                text {
+                    display: block;
+                    font-size: 30rpx;
+                }
+            }
+        }
+    }
+    
+    // 列表
+    .film {
+        width: 100%;
+        padding: 10rpx 30rpx 20rpx;
+        box-sizing: border-box;
+		.film-back {
+			position: relative;
+			border-radius: 20rpx;
+			overflow: hidden;
+			background-size: 100% 100%;
+			background-position: left center;
+			height: 180rpx;
+			line-height: 180rpx;
+			.film-title {
+				position: absolute;
+				left: 30rpx;
+				top: 0;
+				color: #FFFFFF;
+				font-size: 38rpx;
+				font-weight: 600;
+			}
+			.film-btn {
+				position: absolute;
+				font-size: 28rpx;
+				right: 30rpx;
+				top: 60rpx;
+				color: #ecc993;
+				border: 2rpx solid #ecc993;
+				display: inline-block;
+				border-radius: 80rpx;
+				line-height: 56rpx;
+				padding: 0 20rpx;
+			}
+		}
+    }
+    
+	
+	// 已兑换
+	.coupon {
+		padding: 0 30rpx 10rpx;
+		box-sizing: border-box;
+		.couponItem {
+			margin-bottom: 30rpx;
+			.couponItem-cont {
+				background-color: #caa668;
+				border-radius: 10rpx;
+				position: relative;
+				height: 140rpx;
+				overflow: hidden;
+				.couponItem-top {
+					padding: 30rpx 20rpx;
+					box-sizing: border-box;
+					position: absolute;
+					left: 0;
+					top: 0;
+					height: 100%;
+					background-image: linear-gradient(to right, #fffbf5, #f2e2cc);
+					width: calc(100% - 160rpx);
+					display: flex;
+					border-radius: 0 15rpx 15rpx 0;
+					.couponItem-cont-number {
+						width: 100rpx;
+						line-height: 84rpx;
+						color: #a85920;
+						text {
+							font-size: 54rpx;
+						}
+					}
+					.couponItem-cont-name {
+						color: #72411f;
+						padding-left: 40rpx;
+						box-sizing: border-box;
+						width: calc(100% - 100rpx);
+						position: relative;
+						&::after {
+							position: absolute;
+							content: '';
+							left: 13rpx;
+							top: 10%;
+							background-color: #ecd5c1;
+							width: 2rpx;
+							height: 80%;
+						}
+						.couponItem-cont-title {
+							font-size: 30rpx;
+						}
+						.couponItem-cont-show {
+							display: flex;
+							font-size: 26rpx;
+							padding-top: 13rpx;
+							.couponItem-cont-icon {
+								width: 34rpx;
+								height: 34rpx;
+								vertical-align: -6rpx;
+								margin-left: 5rpx;
+								transition: .2s;
+								&.active {
+									 transform:rotate(-180deg);
+								}
+							}
+						}
+					}
+				}
+				.couponItem-btn {
+					line-height: 140rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 160rpx;
+					height: 100%;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 30rpx;
+				}
+			}
+			.couponItem-cont-text {
+				background-image: linear-gradient(-20deg, #fffbf5, #fbefdf);
+				padding: 30rpx;
+				box-sizing: border-box;
+				color: #bc8863;
+				line-height: 48rpx;
+				font-size: 24rpx;
+				margin-top: -4rpx;
+				text-align: justify;
+				border-radius: 0 0 15rpx 15rpx;
+			}
+		}
+	}
+    
+    // 按钮
+    .campusBtn {
+        text-align: center;
+        color: #FFFFFF;
+		background-color: #fff;
+		display: flex;
+		position: fixed;
+		width: 100%;
+		height: 130rpx;
+		z-index: 999;
+		left: 0;
+		bottom: 0;
+		font-size: 28rpx;
+		.campusBtn-go {
+			flex: 2;
+			padding-top: 20rpx;
+			.campusBtn-iocn {
+				width: 44rpx;
+			}
+			.campusBtn-name {
+				color: #abaeb2;
+			}
+			&.active .campusBtn-name {
+				color: #2b3452;
+			}
+		}
+    }
+	
+	// tab
+	.indexTab {
+		display: flex;
+		padding-bottom: 40rpx;
+		.indexTab-item {
+			text-align: center;
+			font-size: 34rpx;
+			flex: 2;
+			padding-bottom: 20rpx;
+			position: relative;
+			color: #8c919f;
+			&::after {
+				position: absolute;
+				content: '';
+				left: calc(50% - 20rpx);
+				bottom: 0;
+				width: 40rpx;
+				height: 8rpx;
+				background-color: transparent;
+				border-radius: 40rpx;
+			}
+			&.active::after {
+				background-color: #27314d;
+			}
+			&.active {
+				color: #27314d;
+				font-weight: 600;
+			}
+			.indexTab-title,
+			.indexTab-number {
+				display: inline-block;
+			}
+		}
+	}
+	
+	.campusTips {
+		padding: 30rpx;
+		box-sizing: border-box;
+		.campusTips-cont {
+			background-color: #fff;
+			border-radius: 20rpx;
+			text-align: center;
+			padding: 80rpx;
+			box-sizing: border-box;
+			color: #9c7557;
+			image {
+				width: 340rpx;
+				height: 280rpx;
+				margin-bottom: 30rpx;
+			}
+			.campusTips-cont-go {
+				display: inline-block;
+				border: #9c7557 2rpx solid;
+				line-height: 66rpx;
+				padding: 0 40rpx;
+				margin-top: 30rpx;
+				font-size: 28rpx;
+				border-radius: 90rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/index.vue b/pages/giftPack/index.vue
new file mode 100644
index 0000000..72724fa
--- /dev/null
+++ b/pages/giftPack/index.vue
@@ -0,0 +1,749 @@
+<template>
+    <view class="content">
+        <view class="content-border">
+        	<view v-for="(item, idx) in adverts" :key="item.cover">
+        	    <image class="campusBanner" :src="item.cover" mode="widthFix"></image>
+        	</view>
+        	<view class="recommend"></view>
+        	<!-- tab -->
+        	<view class="indexTab">
+        	    <view class="indexTab-item" :class="{active : tabType == item.used}" @tap="orderTab" v-for="(item, index) in tabList" :key="index" :data-state="(item.used)">
+        			<view class="indexTab-title">
+        				 {{ item.title }}
+        			</view>
+        			<view class="indexTab-number">
+						<block v-if="isUser">({{item.used == 0 ? '剩余' + numbers + '次' : count + '张'}})</block>
+        			</view>
+        	    </view>
+        	</view>
+        	
+			<!-- 可兑换 -->
+			<block v-if="tabType == 0">
+				<view v-if="isUser">
+					<block v-if="giftPackArr.length > 0">
+						<view class="film" v-for="(item, index) in giftPackArr" :key="index">
+							<view v-if="item.can.buy" class="filMargin">
+								<view class="filmTitle">
+									{{item.title}}
+								</view>
+								<view class="filmList">
+									<view class="filmList-top">
+										<view class="filmList-top-name">
+											{{ item.two_title || '-' }}<text>{{ item.description || '-'}}</text>
+										</view>
+									   <view class="filmList-top-price" :class="{active : !item.can.buy}" @click="judgeGeneral(item.activity_month_category_id)">
+											<text>立即</text>
+											<text>兑换</text>
+										</view>
+									</view>
+									<view class="filmList-text">
+										<text>{{ item.name }}</text>
+									</view>
+									<view class="filmList-tips">兑换前请仔细阅读详细信息。</view>
+									<view class="filmList-more" @click="moreClick(index)">详细信息<image src="/static/icon/giftPack-icon-yellow.png" class="filmList-more-icon" :class="{active: item.schemesShow }" mode="aspectFill"></image></view>
+									
+									<view class="filmList-show" v-if="item.schemesShow">
+										<rich-text :nodes="item.content"></rich-text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 列表为空 -->
+					<view class="campusTips" v-else>
+					    <view class="campusTips-cont">
+					    	<image src="/static/img/giftPack-null.png" mode="aspectFill"></image>
+					    	<view>暂无权益</view>
+					    </view>
+					</view>
+				</view>
+				<view class="campusTips" v-else>
+				    <view class="campusTips-cont">
+				    	<image src="/static/img/giftPack-null.png"></image>
+				    	<view>请您先登录，进行权益查看~</view>
+						<navigator hover-class="none" url="/pages/giftPack/signin" class="campusTips-cont-go">立即登录</navigator>
+				    </view>
+				</view>
+			</block>
+			
+			<!-- 已兑换 -->
+			<block v-if="tabType == 1">
+				<view v-if="isUser">
+					<block v-if="couponArr.length > 0">
+						<view class="coupon" v-for="(item, index) in couponArr" :key="index">
+							<view class="couponItem">
+								<view class="couponItem-cont">
+									<view class="couponItem-top">
+										<view class="couponItem-cont-number">
+											￥<text>{{item.price}}</text>
+										</view>
+									   <view class="couponItem-cont-name">
+											<view class="nowrap couponItem-cont-title">
+												{{item.name}}
+											</view>
+											<view class="couponItem-cont-show" @click="moreCoupon(index)">
+												详细信息<image src="/static/icon/giftPack-icon.png" class="couponItem-cont-icon" :class="{active: item.couponShow }" mode="aspectFill"></image>
+											</view>
+										</view>
+									</view>
+									<navigator class="couponItem-btn" hover-class="none" :url="'/pages/giftPack/details?id=' + item.id">
+										立即使用
+									</navigator>
+								</view>
+								<view class="couponItem-cont-text" v-if="item.couponShow">
+									<rich-text :nodes="item.remark"></rich-text>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 列表为空 -->
+					<view class="campusTips" v-else>
+					    <view class="campusTips-cont">
+					    	<image src="/static/img/giftPack-null.png"></image>
+					    	<view>可使用的权益暂时没有啦~</view>
+							<navigator hover-class="none" url="/pages/giftPack/myCoupon" class="campusTips-cont-go">我的优惠券</navigator>
+					    </view>
+					</view>
+				</view>
+				<view class="campusTips" v-else>
+				    <view class="campusTips-cont">
+				    	<image src="/static/img/giftPack-null.png"></image>
+				    	<view>请您先登录，进行优惠券查看~</view>
+						<navigator hover-class="none" url="/pages/giftPack/signin" class="campusTips-cont-go">立即登录</navigator>
+				    </view>
+				</view>
+			</block>
+        </view>
+		
+        <!-- 按钮 -->
+		<view class="campusBtn">
+			<navigator url="/pages/giftPack/index" hover-class="none" class="campusBtn-go active">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user00_active.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					活动首页
+				</view>
+			</navigator>
+			<navigator url="/pages/giftPack/user" hover-class="none" class="campusBtn-go">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user01.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					个人中心
+				</view>
+			</navigator>
+		</view>
+		
+		
+		<!-- 是否兑换弹出 -->
+		<view class="tipsBack" v-if="generalShow"></view>
+		<view class="tipsCont" v-if="generalShow">
+			<view class="tipsWhite">
+				<image class="tipsCont-img" src="/static/img/dhImg.png" mode="widthFix"></image>
+				<view class="tipsWhite-top">
+					<view class="tipsWhite-name">
+						兑换权益提示
+					</view>
+					<view class="tipsWhite-text">
+						<text>兑换权益前请仔细阅读，本权益项下的</text>
+						<text>【详细信息】。确认兑换后，您本月将不能</text>
+						<text>换取其他权益。如确定请点击【立即兑换】</text>
+					</view>
+				</view>
+				<view class="tipsWhite-btn">
+					<view class="tipsWhite-btn-go" @click="generalShow = false">
+						暂不兑换
+					</view>
+					<view class="tipsWhite-btn-go" @click="payment">
+						立即兑换
+					</view>
+				</view>
+			</view>
+		</view>
+		
+    </view>
+</template>
+
+<script>
+    import { index, coupon, monthsChoose } from '@/apis/interfaces/giftPack'
+    export default {
+        data() {
+            return {
+				isUser      : false,  // 用户是否登录
+				giftPackArr : [],
+                adverts     : [],
+				couponArr   : [],
+				numbers     : '',
+				count       : '',
+				
+				//Tab列表
+				tabList     : [
+				    { title : "可兑换", used: 0 },
+				    { title : "已兑换", used: 1 }
+				],
+				tabType     : 0, //卡券状态
+				generalId   : '', //卡券id
+				generalShow : false //卡券兑换提示
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-月兑活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+			if(uni.getStorageSync("token")) {
+				this.isUser = true
+			}
+			
+			// 获取首页数据
+			this.indexInfo()
+			
+        },
+        methods: {
+            // 首页数据
+            indexInfo() {
+				if(this.tabType == 0) {
+					// 获取首页数据
+					index().then(res=>{
+						var listData = res.categories
+						for(let val in listData){
+							listData[val].schemesShow = false
+						}
+						this.giftPackArr = listData
+						this.numbers     = res.numbers
+						this.count       = res.coupons_count
+						this.adverts     = res.adverts
+					}).catch(err=>{})
+				} else {
+					if(uni.getStorageSync("token")) {
+						// 获取优惠券数据
+						coupon().then(res=>{
+							var listData = res.data 
+							for(let val in listData){
+								listData[val].couponShow = false
+							}
+							this.couponArr = listData
+						}).catch(err=>{})
+					}
+					
+				}
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/giftPack/signin'
+                })
+            },
+			
+			// tabs 选项卡
+			orderTab(e){
+				let state = e.currentTarget.dataset.state
+				this.tabType = state
+				
+				// 获取首页数据
+				this.indexInfo();
+			},
+			
+			// 可兑换信息展开
+			moreClick(index) {
+				this.giftPackArr[index].schemesShow = !this.giftPackArr[index].schemesShow
+			},
+			
+			// 已兑换细信息展开
+			moreCoupon(index) {
+				this.couponArr[index].couponShow = !this.couponArr[index].couponShow
+			},
+			
+			// 兑换按钮
+			judgeGeneral(id) {
+				this.generalId   = id
+				if(this.numbers != 0) {
+					this.generalShow = !this.generalShow
+					return
+				}
+				uni.navigateTo({
+					url: '/pages/giftPack/list?id=' + id
+				})
+			},
+			
+			// 兑换跳转
+			payment(){
+				monthsChoose(this.generalId).then(res=>{
+					this.generalShow = false
+					uni.navigateTo({
+						url: '/pages/giftPack/list?id=' + this.generalId
+					})
+				}).catch(err=>{})
+			}
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .content {
+        background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        padding-bottom: 40rpx;
+		height: 100vh;
+		overflow-y: scroll;
+		box-sizing:  border-box
+    }
+	.content-border {
+		border-bottom: 130rpx transparent solid;
+	}
+    
+    // banner
+    .campusBanner {
+        width: 100%;
+    }
+    
+    // 推荐
+    .recommend {
+        overflow: hidden;
+        margin-top: -60rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        .recommend-label {
+            text-align: center;
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx 30rpx;
+            .recommend-label-img {
+                width: 150rpx;
+                height: 150rpx;
+                margin: 0 auto 10rpx;
+                background: linear-gradient(to bottom, #293350, #484e74);
+                box-shadow: 0px 8px 6px rgba(249,228,129,.5);
+                border-radius: 50%;
+                box-sizing: border-box;
+                image {
+                    width: 80rpx;
                    height: 80rpx;
+                    margin: 35rpx;
+                }
+            }
+            .recommend-label-text {
+                text {
+                    display: block;
+                    font-size: 30rpx;
+                }
+            }
+        }
+    }
+    
+    // 列表
+    .film {
+        width: 100%;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+    }
+	.filMargin {
+		padding: 0 0 30rpx;
+	}
+    .filmTitle {
+        background: linear-gradient(to right, #feefce, #fbe9c0, #e8d19b);
+        line-height: 80rpx;
+        box-shadow: -4px 0 10px rgba(134,97,33,.2);
+        text-align: center;
+        border-radius: 10rpx 10rpx 0 0;
+        color: #a47d53;
+        margin: 0 20rpx;
+    }
+    .filmList {
+        position: relative;
+        background: linear-gradient(to right, #494e75, #27314d);
+        box-shadow: 0px 6px 10px rgba(134,97,33,.5);
+        border-radius: 10rpx;
+        padding: 50rpx 30rpx 30rpx;
+        box-sizing: border-box;
+        margin-bottom: 20rpx;
+        overflow: hidden;
+        &:last-child {
+            margin-bottom: 0;
+        }
+        .filmList-tag {
+            transform: rotate(45deg);
+            position: absolute;
+            padding: 10px 0;
+            right: -33px;
+            top: -10px;
+            width: 150px;
+            background: red;
+            .filmList-tag-text {
+                position: absolute;
+                color: #FFFFFF;
+                right: 20px;
+                text-align: center;
+                top: 2px;
+                font-size: 12px;;
+                transform:rotate(-360deg);
+            }
+        }
+    	.filmList-more {
+    		font-size: 26rpx;
+    		text-align: left;
+    		color: #fce2ae;
+    		margin-top: 15rpx;
+    		line-height: 40rpx;
+    		.filmList-more-icon {
+    			width: 34rpx;
+    			height: 34rpx;
+    			vertical-align: -6rpx;
+    			margin-left: 5rpx;
+    			transition: .2s;
+    			&.active {
+    				 transform:rotate(-180deg);
+    			}
+    		}
+    	}
+    	.filmList-show {
+    		font-size: 24rpx;
+    		border-radius: 10rpx;
+    		background-color: rgba(255,255,255,.1);
+    		padding: 20rpx;
+    		box-sizing: border-box;
+    		margin-top: 20rpx;
+    		opacity: .9;
+    		color: #fce2ae;
+    		text-align: justify;
+    		line-height: 42rpx;
+    		text {
+    			display: block;
+    		}
+    	}
+        .filmList-top {
+            display: flex;
+    		margin-bottom: 10rpx;
+            .filmList-top-name {
+                width: calc(100% - 140rpx);
+                margin-right: 20rpx;
+                color: #fce2ae;
+                font-size: 32rpx;
+    			margin-top: 10rpx;
+                text {
+                    display: block;
+                    font-size: 25rpx;
+                    margin-top: 15rpx;
+                }
+            }
+            .filmList-top-price {
+    			position: relative;
+                background: linear-gradient(to right, #d3ad68, #cda65f);
+                box-shadow: 0px 2px 10px rgba(249,228,129,.5);
+                width: 120rpx;
+                height: 120rpx;
+                border-radius: 50%;
+                color: #FFFFFF;
+                text-align: center;
+                padding-top: 20rpx;
+                font-size: 30rpx;
+                box-sizing: border-box;
+    			&.active {
+    				background: linear-gradient(to right, #a1a1a1, #a1a1a1);
+    			}
+                text {
+                    display: block;
+                    text-shadow: 0px 6px 10px rgba(134,97,33,.5);
+                }
+    			.filmList-tag{
+    				position: absolute;
+    				background: #ff0000;
+    				color: white;
+    				font-size: 20rpx;
+    				top: -10%;
+    				left: 20%;
+    				width: 120rpx;
+    				padding: 0 10rpx;
+    				line-height: 40rpx;
+    				border-radius: 15rpx;
+    				transform: scale(0.58)
+    			}
+            }
+        }
+        .filmList-text {
+            font-size: 20rpx;
+            color: #c1c1c1;
+    		// margin-left: -70rpx;
+            text {
+                display: block;
+    			// transform: scale(0.8)
+            }
+        }
+		.filmList-tips {
+			font-size: 24rpx;
+			color: #c1c1c1;
+			margin-top: 30rpx;
+		}
+    }
+	
+	// 已兑换
+	.coupon {
+		padding: 0 30rpx 10rpx;
+		box-sizing: border-box;
+		.couponItem {
+			margin-bottom: 30rpx;
+			.couponItem-cont {
+				background-color: #caa668;
+				border-radius: 10rpx;
+				position: relative;
+				height: 140rpx;
+				overflow: hidden;
+				.couponItem-top {
+					padding: 30rpx 20rpx;
+					box-sizing: border-box;
+					position: absolute;
+					left: 0;
+					top: 0;
+					height: 100%;
+					background-image: linear-gradient(to right, #fffbf5, #f2e2cc);
+					width: calc(100% - 160rpx);
+					display: flex;
+					border-radius: 0 15rpx 15rpx 0;
+					.couponItem-cont-number {
+						width: 100rpx;
+						line-height: 84rpx;
+						color: #a85920;
+						text {
+							font-size: 54rpx;
+						}
+					}
+					.couponItem-cont-name {
+						color: #72411f;
+						padding-left: 40rpx;
+						box-sizing: border-box;
+						width: calc(100% - 100rpx);
+						position: relative;
+						&::after {
+							position: absolute;
+							content: '';
+							left: 13rpx;
+							top: 10%;
+							background-color: #ecd5c1;
+							width: 2rpx;
+							height: 80%;
+						}
+						.couponItem-cont-title {
+							font-size: 30rpx;
+						}
+						.couponItem-cont-show {
+							display: flex;
+							font-size: 26rpx;
+							padding-top: 13rpx;
+							.couponItem-cont-icon {
+								width: 34rpx;
+								height: 34rpx;
+								vertical-align: -6rpx;
+								margin-left: 5rpx;
+								transition: .2s;
+								&.active {
+									 transform:rotate(-180deg);
+								}
+							}
+						}
+					}
+				}
+				.couponItem-btn {
+					line-height: 140rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 160rpx;
+					height: 100%;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 30rpx;
+				}
+			}
+			.couponItem-cont-text {
+				background-image: linear-gradient(-20deg, #fffbf5, #fbefdf);
+				padding: 30rpx;
+				box-sizing: border-box;
+				color: #bc8863;
+				line-height: 48rpx;
+				font-size: 24rpx;
+				margin-top: -4rpx;
+				text-align: justify;
+				border-radius: 0 0 15rpx 15rpx;
+			}
+		}
+	}
+    
+    // 按钮
+    .campusBtn {
+        text-align: center;
+        color: #FFFFFF;
+		background-color: #fff;
+		display: flex;
+		position: fixed;
+		width: 100%;
+		height: 130rpx;
+		z-index: 999;
+		left: 0;
+		bottom: 0;
+		font-size: 28rpx;
+		.campusBtn-go {
+			flex: 2;
+			padding-top: 20rpx;
+			.campusBtn-iocn {
+				width: 44rpx;
+			}
+			.campusBtn-name {
+				color: #abaeb2;
+			}
+			&.active .campusBtn-name {
+				color: #2b3452;
+			}
+		}
+    }
+	
+	// tab
+	.indexTab {
+		display: flex;
+		margin-bottom: 30rpx;
+		.indexTab-item {
+			text-align: center;
+			font-size: 34rpx;
+			flex: 2;
+			padding-bottom: 20rpx;
+			position: relative;
+			color: #8c919f;
+			&::after {
+				position: absolute;
+				content: '';
+				left: calc(50% - 20rpx);
+				bottom: 0;
+				width: 40rpx;
+				height: 8rpx;
+				background-color: transparent;
+				border-radius: 40rpx;
+			}
+			&.active::after {
+				background-color: #27314d;
+			}
+			&.active {
+				color: #27314d;
+				font-weight: 600;
+			}
+			.indexTab-title,
+			.indexTab-number {
+				display: inline-block;
+			}
+		}
+	}
+	
+	.campusTips {
+		padding: 30rpx;
+		box-sizing: border-box;
+		.campusTips-cont {
+			background-color: #fff;
+			border-radius: 20rpx;
+			text-align: center;
+			padding: 80rpx;
+			box-sizing: border-box;
+			color: #9c7557;
+			image {
+				width: 340rpx;
+				height: 280rpx;
+				margin-bottom: 30rpx;
+			}
+			.campusTips-cont-go {
+				display: inline-block;
+				border: #9c7557 2rpx solid;
+				line-height: 66rpx;
+				padding: 0 40rpx;
+				margin-top: 30rpx;
+				font-size: 28rpx;
+				border-radius: 90rpx;
+			}
+		}
+	}
+	
+	// 是否兑换弹出
+	.tipsBack {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		z-index: 9;
+		background-color: rgba(0, 0, 0, .8);
+	}
+	.tipsCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 10;
+		padding: 0 10%;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsWhite {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+	
+	.tipsWhite-top {
+		padding: 30rpx;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsCont-img {
+		width: 40%;
+		margin-top: 30rpx;
+	}
+	
+	.tipsWhite-name {
+		text-align: center;
+		color: #111111;
+		font-size: 34rpx;
+		font-weight: 600;
+		margin-bottom: 15rpx;
+	}
+	
+	.tipsWhite-text {
+		font-size: 26rpx;
+		color: #666666;
+		line-height: 48rpx;
+		text {
+			display: block;
+		}
+	}
+	
+	.tipsWhite-btn {
+		display: flex;
+		padding: 20rpx 10rpx 30rpx;
+		box-sizing: border-box;
+		.tipsWhite-btn-go {
+			flex: 2;
+			color: #fff;
+			margin: 0 15rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			border: 2rpx solid #F6F6F6;
+			background-color: #27314d;
+			border-radius: 10rpx;
+			&:first-child {
+				color: #333333;
+				background-color: #ffffff;
+				border: 2rpx solid #cccccc;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/list.vue b/pages/giftPack/list.vue
new file mode 100644
index 0000000..3712664
--- /dev/null
+++ b/pages/giftPack/list.vue
@@ -0,0 +1,233 @@
+<template>
+    <view class="content">
+		<view v-for="(item, idx) in adverts" :key="item.cover">
+		    <image class="campusBanner" :src="item.cover" mode="widthFix"></image>
+		</view>
+		<view class="recommend"></view>
+        <view class="special-list" v-if="giftPackArr.length > 0">
+        	<navigator hover-class="none" :url="'buy?id=' + item.activity_month_id" class="special-label" v-for="(item, index) in giftPackArr" :key="index">
+				<view class="special-rebate" v-if="item.label != null">{{item.label}}</view>
+				<view class="welfareCont-top" >
+					<view class="welfareCont-list-img" >
+						<image :src="item.cover" mode="aspectFill"></image>
+					</view>
+				</view>
+				<view class="special-text">
+					<view class="nowrap special-name">{{item.title}}</view>
+					<view class="special-tips">{{item.two_title}}</view>
+				</view>
+        	</navigator>
+        </view>
+        <!-- 列表为空 -->
+        <view class="campusTips" v-else>
+            <view class="campusTips-cont">
+            	<image src="/static/img/giftPack-null.png" mode="aspectFill"></image>
+            	<view>抱歉，暂无可购买权益</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, monthsList } from '@/apis/interfaces/giftPack'
+    export default {
+        data() {
+            return {
+				adverts     : [],
+				giftPackArr : []
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+			// 获取列表数据
+			this.monthsInfo(options.id);
+		},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-月兑活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+            // 获取分类数据
+            this.indexInfo();
+        },
+        methods: {
+			// 分类数据
+			indexInfo() {
+				index().then(res=>{
+					this.adverts     = res.adverts
+				}).catch(err=>{})
+			},
+			
+            // 列表数据
+            monthsInfo(id) {
+				monthsList(id).then(res=>{
+					this.giftPackArr = res
+				}).catch(err=>{})
+            },
+			
+			// 可兑换信息展开
+			moreClick(index) {
+				this.giftPackArr[index].schemesShow = !this.giftPackArr[index].schemesShow
+			},
+			
+			// 已兑换细信息展开
+			moreCoupon(index) {
+				this.couponArr[index].couponShow = !this.couponArr[index].couponShow
+			},
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .content {
+        background: #fff;
+        padding-bottom: 40rpx;
+    	height: 100vh;
+    	overflow-y: scroll;
+    	box-sizing:  border-box
+    }
+	
+	// banner
+	.campusBanner {
+	    width: 100%;
+	}
+	
+	// 推荐
+	.recommend {
+	    overflow: hidden;
+	    margin-top: -70rpx;
+	    padding: 0 30rpx;
+	    box-sizing: border-box;
+	}
+	
+    // 列表
+    .film {
+        width: 100%;
+        padding: 30rpx;
+        box-sizing: border-box;
+    }
+	.special-list {
+	    flex-wrap: wrap;
+	    display: flex;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.special-label {
+	    margin: 10rpx;
+	    width: calc(50% - 20rpx);
+	    height: 330rpx;
+	    flex: 0 0 calc(50% - 20rpx);
+	    border: 4rpx solid #fb9b00;
+		background-color: #ffe0b8;
+	    border-radius: 10rpx;
+	    text-align: center;
+	    padding: 20rpx 0;
+	    box-sizing: border-box;
+	    position: relative;
+	}
+	
+	.special-label:last-child {
+	    margin-bottom: 0;
+	}
+	
+	.special-rebate {
+	    position: absolute;
+	    top: -30rpx;
+	    right: 10rpx;
+	    background: #fe0002;
+	    color: #fff;
+	    border-radius: 30rpx;
+	    line-height: 52rpx;
+	    height: 52rpx;
+	    font-size: 26rpx;
+	    padding: 0 20rpx;
+	    font-weight: 600;
+	}
+	
+	.welfareCont-top{
+	    white-space: nowrap;
+	    flex-direction: row;
+	    align-items: center;
+	    justify-content: space-around;
+	    width: 100%;
+	    padding: 0 10rpx;
+	    box-sizing: border-box;
+	    margin: 10rpx 0;
+	}
+	
+	.welfareCont-list-img {
+	    border: 2rpx solid #eccc69;
+	    border-radius: 50%;
+	    width: 100rpx;
+	    height: 100rpx;
+	    display: inline-block;
+	    margin: 0 10rpx;
+	    overflow: hidden;
+	}
+	
+	.welfareCont-list-img image {
+	    width: 100%;
+	    height: 100%;
+	}
+	
+	.campusTips {
+		padding: 30rpx;
+		box-sizing: border-box;
+		.campusTips-cont {
+			background-color: #fff;
+			border-radius: 20rpx;
+			text-align: center;
+			padding: 80rpx;
+			box-sizing: border-box;
+			color: #9c7557;
+			image {
+				width: 340rpx;
+				height: 280rpx;
+				margin-bottom: 30rpx;
+			}
+			.campusTips-cont-go {
+				display: inline-block;
+				border: #9c7557 2rpx solid;
+				line-height: 66rpx;
+				padding: 0 40rpx;
+				margin-top: 30rpx;
+				font-size: 28rpx;
+				border-radius: 90rpx;
+			}
+		}
+	}
+	
+	.special-text {
+	    padding: 0 15rpx;
+	    box-sizing: border-box;
+	    position: relative;
+	    font-size: 26rpx;
+	    border-top: 4rpx dashed #fb9b00;
+	    margin-top: 20rpx;
+	    padding-top: 20rpx;
+	}
+	
+	.special-name {
+	    color: #6f4a2d;
+	    font-weight: 600;
+	    font-size: 28rpx;
+	}
+	
+	.special-tips {
+	    background-color: #242424;
+	    color: #fff;
+	    border-radius: 10rpx;
+	    padding: 4rpx 20rpx;
+	    line-height: 46rpx;
+	    height: 46rpx;
+	    margin-top: 20rpx;
+	    font-size: 24rpx;
+	    display: inline-block;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	}
+
+</style>
diff --git a/pages/giftPack/logs.vue b/pages/giftPack/logs.vue
new file mode 100644
index 0000000..eba09b4
--- /dev/null
+++ b/pages/giftPack/logs.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="content">
+		<view class="title">
+			积分记录
+		</view>
+		<view class="list" v-if="accounts.length > 0">
+			<view class="item" v-for="(item, index) in accounts" :key="index">
+				<image class="item-img" src="@/static/img/giftPack-img09.png" mode="widthFix"></image>
+				<view class="item-cont">
+					<view class="item-cont-top">
+						<div class="item-cont-name">{{item.title}}</div>
+						<div class="item-cont-number">{{item.variable}}</div>
+					</view>
+					<view class="item-cont-bottom">
+						<div class="item-cont-total" v-if="userData.gold">余额：{{userData.gold.balance}}</div>
+						<div class="item-cont-time">{{item.created_at}}</div>
+					</view>
+				</view>
+			</view>
+			
+			<view class="pagesLoding" v-if="lodingStats">
+			    <block v-if="page.has_more">
+			        <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>加载中...
+			    </block>
+			    <block v-else>
+			        没有更多了~
+			    </block>
+			</view>
+		</view>
+		
+		<!-- 暂无内容 -->
+		<view class="campusTips" v-else>
+		    <view class="campusTips-cont">
+		    	<image src="/static/img/giftPack-null.png" mode="aspectFill"></image>
+		    	<view>抱歉，目前暂无内容~</view>
+		    </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { logs } from '@/apis/interfaces/giftPack'
+	import { index } from '@/apis/interfaces/user'
+	export default {
+	    data() {
+	        return {
+				userData    : '', //用户
+				accounts    : '',           // 账户列表
+				page: {
+				    has_more: false
+				},                          // 下一页
+				lodingStats: false          // 数据加载完渲染
+	        }
+	    },
+	    
+	    // 生命周期函数--监听页面显示
+	    onShow() {
+			// 存储环境-月兑活动
+			getApp().globalData.envType = 'giftPEnv'
+			
+	        // 获取账变记录
+	        this.accountInfo();
+			
+			// 获取用户接口
+			this.userInfo();
+	    },
+	    methods: {
+			// 用户接口
+			userInfo() {
+				// 获取用户信息
+				index().then(res => {
+				    this.userData = res
+				}).catch(err => {
+				    if (!err.login) {
+				        uni.showModal({
+				            title: '用户登录已过期',
+				            content: '请重新登录',
+				            showCancel: false,
+				            success: res => {
+				                if (res.confirm) {
+				                    uni.redirectTo({
+				                        url: '/pages/giftPack/signin'
+				                    });
+				                }
+				            }
+				        });
+				    }
+				});
+			},
+			
+			// 账变记录
+			accountInfo(page) {
+			    logs({
+					type    : 'gold',
+			        page    : page,
+					channel : 'all'
+			    }).then(res=>{
+			        let newStores = this.accounts,
+			            newData = []
+			        if(page == 1 || page == undefined) newStores = []
+			        newData = newStores.concat(res.data)
+			        this.accounts    = newData
+			        this.page        = res.page
+			        this.lodingStats = false
+			        uni.stopPullDownRefresh()
+			    })
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.title {
+		font-size: 36rpx;
+		font-weight: 600;
+	}
+	
+	.list {
+		margin-top: 30rpx;
+		.item {
+			background-color: #fff;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
+			display: flex;
+			.item-img {
+				width: 54rpx;
+				margin-top: 25rpx;
+			}
+			.item-cont {
+				width: calc(100% - 54rpx);
+				padding-left: 30rpx;
+				box-sizing: border-box;
+				.item-cont-top {
+					display: flex;
+					font-size: 32rpx;
+					font-weight: 600;
+					margin-bottom: 20rpx;
+					.item-cont-name {
+						flex: 1;
+					}
+				}
+				.item-cont-bottom {
+					font-size: 28rpx;
+					color: #a4a4a4;
+					display: flex;
+					.item-cont-total {
+						flex: 1;
+					}
+				}
+			}
+		}
+	}
+	
+	.campusTips {
+		margin-top: 40rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		.campusTips-cont {
+			background-color: #fff;
+			border-radius: 20rpx;
+			text-align: center;
+			padding: 80rpx;
+			box-sizing: border-box;
+			color: #9c7557;
+			image {
+				width: 340rpx;
+				height: 280rpx;
+				margin-bottom: 30rpx;
+			}
+			.campusTips-cont-go {
+				display: inline-block;
+				border: #9c7557 2rpx solid;
+				line-height: 66rpx;
+				padding: 0 40rpx;
+				margin-top: 30rpx;
+				font-size: 28rpx;
+				border-radius: 90rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/giftPack/myCoupon.vue b/pages/giftPack/myCoupon.vue
new file mode 100644
index 0000000..6d7ac18
--- /dev/null
+++ b/pages/giftPack/myCoupon.vue
@@ -0,0 +1,541 @@
+<template>
+    <view class="content">
+        <view class="user">
+           <image src="/static/img/giftPackCoupon_user.png" mode=""></image> 尊敬的<text>{{ userTel }}</text>, 欢迎参加此活动
+        </view>
+        <!-- 我的卡券 -->
+		<view class="campusCont">
+			<!-- 卡券tab -->
+			<view class="couponTab">
+				<view class="couponTab-label" :class="{active : stateType == item.used}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-index="(index)" :data-state="(item.used)">
+					{{ item.title }}
+				</view>
+			</view>
+			
+			<!-- 卡券列表 -->
+			<view class="coupon" v-if="coupons.length > 0" :class="{active : coupons.length < 1}">
+				<view class="couponItem" v-for="(item, index) in coupons" :key="index" :class="{active: item.status != 0}">
+					<view class="couponItem-cont">
+						<view class="couponItem-top">
+							<view class="couponItem-cont-number">
+								￥<text>{{item.price}}</text>
+							</view>
+						   <view class="couponItem-cont-name">
+								<view class="nowrap couponItem-cont-title">
+									{{item.name}}
+								</view>
+								<view class="couponItem-cont-show" @click="moreCoupon(index)">
+									详细信息<image src="/static/icon/giftPack-icon.png" class="couponItem-cont-icon" :class="{active: item.couponShow }" mode="widthFix"></image>
+								</view>
+							</view>
+						</view>
+						<navigator v-if="item.status == 0" class="couponItem-btn" hover-class="none" :url="'/pages/giftPack/details?id=' + item.id">
+							立即使用
+						</navigator>
+						<view v-else-if="item.status == 1" class="couponItem-btn">
+							已使用
+						</view>
+						<view v-else class="couponItem-btn">
+							已过期
+						</view>
+					</view>
+					
+					<view class="couponItem-cont-text" v-if="item.couponShow">
+						<rich-text :nodes="item.remark"></rich-text>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 列表为空 -->
+			<view class="campusTips" v-else>
+			    <view class="campusTips-cont">
+			    	<image src="/static/img/giftPack-null.png" mode="aspectFill"></image>
+			    	<view>暂无优惠券</view>
+			    </view>
+			</view>
+			
+		</view>
+        
+        <!-- 漂浮窗 -->
+        <!-- <view class="indexFloat" @click="followBtn">
+        	<image src="/static/img/subscribe.jpg" mode="aspectFill" class="indexFloat-animation"></image>
+            <view class="indexFloat-text">
+                <text>关注小程序</text>
+            </view>
+        </view> -->
+        
+        <!-- 关注公众号弹出 -->
+        <view class="followBack" :class="{active : followState}"></view>
+        <view class="followPop" :class="{active : followState}">
+            <image class="followPop-img" src="/static/img/subscribe.jpg" mode="widthFix"></image>
+            <view class="followPop-text">
+                <text>长按识别图中二维码</text>
+                <image src="/static/img/follow_tips.png" mode="aspectFill"></image>
+            </view>
+            <view class="followPop-tips">
+                超级红包活动
+            </view>
+        </view>
+        <image class="followPop-clos" :class="{active : followState}" src="/static/icon/add.png" mode="aspectFill" @click="followBtn"></image>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/user'
+    import { coupon } from '@/apis/interfaces/giftPack'
+    export default {
+        data() {
+            return {
+                userTel     : '',   //用户者手机号
+                coupons     : [],   //优惠券列表
+                //优惠券Tab列表
+                couponLabel : [
+                    { title : "未使用", used: 0 },
+                    { title : "已使用", used: 1 },
+                    { title : "已过期", used: 2 }
+                ],
+                stateType   : '0', //卡券状态
+                type        : '',  //卡券来源
+                followState : false //二维码弹出状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 获取用户信息
+            index().then(res => {
+                this.userTel = res.info.username
+            }).catch(err => {
+                if (!err.login) {
+                    uni.showModal({
+                        title: '用户登录已过期',
+                        content: '请重新登录',
+                        showCancel: false,
+                        success: res => {
+                            if (res.confirm) {
+                                uni.redirectTo({
+                                    url: '/pages/giftPack/signin'
+                                });
+                            }
+                        }
+                    });
+                }
+            });
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-本时大礼包新活动
+            getApp().globalData.envType = 'giftPEnv'
+            
+            // 获取列表
+            this.couponInfo();
+        },
+        methods: {
+            // 卡券列表
+            couponInfo() {
+                coupon({
+                    status: this.stateType
+                }).then(res=>{
+					var listData = res.data
+					for(let val in listData){
+						listData[val].couponShow = false
+					}
+					this.coupons = listData
+					
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    wx.redirectTo({
+                                        url: '/pages/giftPack/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // tabs 选项卡
+            orderTab(e){
+                this.stateType = e.currentTarget.dataset.state
+				
+                // 获取卡权益
+                this.couponInfo()
+            },
+            
+            // 已兑换细信息展开
+            moreCoupon(index) {
+            	this.coupons[index].couponShow = !this.coupons[index].couponShow
+            },
+            
+            // 优惠券跳转详情
+            couponUrl(e) {
+                let newId     = e.currentTarget.dataset.id
+                uni.navigateTo({
+                    url: '/pages/giftPack/details?id=' + newId
+                })
+            },
+            
+            // 公众号展示
+            followBtn() {
+                this.followState = !this.followState
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 用户信息 */
+    .user {
+        width: 100%;
+        background: #fff;
+        font-size: 28rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        color: #a85920;
+        display: flex;
+        line-height: 48rpx;
+    }
+    
+    .user text {
+        font-weight: 600;
+        padding: 0 10rpx;
+    }
+    
+    .user image {
+        width: 48rpx;
+        height: 48rpx;
+        margin-right: 10rpx;
+    }
+    
+    .campusCont {
+        padding: 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .campusCont.active {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .couponTab{
+		display: flex;
+    }
+    
+    .couponTab-label {
+        flex: 3;
+        text-align: center;
+        font-size: 30rpx;
+		position: relative;
+		padding-bottom: 20rpx;
+		&::after {
+			position: absolute;
+			content: '';
+			left: calc(50% - 20rpx);
+			bottom: 0;
+			width: 40rpx;
+			height: 8rpx;
+			background-color: transparent;
+			border-radius: 40rpx;
+		}
+		&.active {
+			color: #a85920;
+			font-weight: 600;
+		}
+		&.active::after {
+			background-color: #a85920;
+		}
+    }
+
+    .couponTab-label view {
+        font-size: 24rpx;
+        margin-top: 6rpx;
+    }
+    
+    .coupon {
+        padding-bottom: 10rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        right: 20rpx;
+        bottom: 180rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-text {
+        height: 40rpx;
+        overflow: hidden;
+        color: #000000;
+    }
+    
+    .indexFloat-text text {
+        line-height: 40rpx;
+        display: block;
+        font-size: 24rpx;
+    }
+    
+    .indexFloat-animation {
+        width: 130rpx;
+        height: 130rpx;
+        animation: shake 3s linear infinite;
+    }
+    
+    @keyframes shake {
+        70%, 80% {
+          transform: rotate(7deg);
+        }
+        75% {
+          transform: rotate(-7deg);
+        }
+       
+        65%,
+        85% {
+          transform: rotate(0);
+        }
+    }
+    
+    /* 关注公众号弹出 */
+    .followBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        background: rgba(0,0,0,.7);
+        left: 0;
+        top: 0;
+        z-index: 1000;
+        display: none;
+    }
+    
+    .followBack.active {
+        display: block;
+    }
+    
+    .followPop {
+        position: fixed;
+        z-index: 1001;
+        height: 760rpx;
+        left: 15%;
+        right: 15%;
+        top: 300rpx;
+        background-color: #ffffff;
+        border-radius: 20rpx;
+        text-align: center;
+        overflow: hidden;
+        display: none;
+    }
+    
+    .followPop.active {
+        display: block;
+    }
+    
+    .followPop-img {
+        width: 70%;
+        margin: 60rpx 0 50rpx;
+    }
+    
+    .followPop-text {
+        color: #7d7d7d;
+        font-size: 32rpx;
+        position: relative;
+    }
+    
+    .followPop-text::after,
+    .followPop-text::before {
+        position: absolute;
+        content: '';
+        top: 25rpx;
+        width: 60rpx;
+        height: 2rpx;
+        background-color: #cfcfcf;
+    }
+    
+    .followPop-text::after {
+        left: 30rpx;
+    }
+    
+    .followPop-text::before {
+        right: 30rpx;
+    }
+    
+    .followPop-text image {
+        width: 120rpx;
+        height: 120rpx;
+        margin: 10rpx auto 20rpx;
+        display: block;
+    }
+    
+    .followPop-tips {
+        background-color: #e1e5ec;
+        line-height: 90rpx;
+        color: #7f8487;
+    }
+    
+    .followPop-clos {
+        position: fixed;
+        top: 1100rpx;
+        left: calc(50% - 25rpx);
+        width: 50rpx;
+        height: 50rpx;
+        z-index: 1001;
+        display: none;
+        transform: rotate(45deg);
+    }
+    
+    .followPop-clos.active {
+        display: block;
+    }
+	
+	// 优惠券
+	.coupon {
+		margin-top: 40rpx;
+		.couponItem {
+			margin-bottom: 30rpx;
+			.couponItem-cont {
+				background-color: #caa668;
+				border-radius: 10rpx;
+				position: relative;
+				height: 140rpx;
+				overflow: hidden;
+				.couponItem-top {
+					padding: 30rpx 20rpx;
+					box-sizing: border-box;
+					position: absolute;
+					left: 0;
+					top: 0;
+					height: 100%;
+					background-image: linear-gradient(to right, #fffbf5, #f2e2cc);
+					width: calc(100% - 160rpx);
+					display: flex;
+					border-radius: 0 15rpx 15rpx 0;
+					.couponItem-cont-number {
+						width: 100rpx;
+						line-height: 84rpx;
+						color: #a85920;
+						text {
+							font-size: 54rpx;
+						}
+					}
+					.couponItem-cont-name {
+						color: #72411f;
+						padding-left: 40rpx;
+						box-sizing: border-box;
+						width: calc(100% - 100rpx);
+						position: relative;
+						&::after {
+							position: absolute;
+							content: '';
+							left: 13rpx;
+							top: 10%;
+							background-color: #ecd5c1;
+							width: 2rpx;
+							height: 80%;
+						}
+						.couponItem-cont-title {
+							font-size: 30rpx;
+						}
+						.couponItem-cont-show {
+							display: flex;
+							font-size: 26rpx;
+							padding-top: 13rpx;
+							.couponItem-cont-icon {
+								width: 32rpx;
+								margin-left: 5rpx;
+							}
+						}
+					}
+				}
+				.couponItem-btn {
+					line-height: 140rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 160rpx;
+					height: 100%;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 30rpx;
+				}
+			}
+			.couponItem-cont-text {
+				background-image: linear-gradient(-20deg, #fffbf5, #fbefdf);
+				padding: 30rpx;
+				box-sizing: border-box;
+				color: #bc8863;
+				line-height: 48rpx;
+				font-size: 24rpx;
+				margin-top: -4rpx;
+				text-align: justify;
+				border-radius: 0 0 15rpx 15rpx;
+			}
+			.couponItem-cont-show {
+				display: flex;
+				font-size: 26rpx;
+				padding-top: 13rpx;
+				.couponItem-cont-icon {
+					width: 34rpx;
+					height: 34rpx;
+					vertical-align: -6rpx;
+					margin-left: 5rpx;
+					transition: .2s;
+					&.active {
+						 transform:rotate(-180deg);
+					}
+				}
+			}
+			&.active .couponItem-cont {
+				background: #c1c1c1;
+			}
+			&.active .couponItem-top {
+				background-image: linear-gradient(to right, #d9d9d9, #d9d9d9);
+			}
+			&.active .couponItem-cont-number,
+			&.active .couponItem-cont-title,
+			&.active .couponItem-cont-show {
+				color: #7e7e7e !important;
+			}
+			&.active .couponItem-cont-icon {
+				filter: grayscale(100%);
+			}
+			&.active .couponItem-cont-text{
+				background-image: linear-gradient(to right, #eaeaea, #eaeaea);
+				color: #7e7e7e !important;
+			}
+		}
+	}
+	
+	.campusTips {
+		margin-top: 40rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		.campusTips-cont {
+			background-color: #fff;
+			border-radius: 20rpx;
+			text-align: center;
+			padding: 80rpx;
+			box-sizing: border-box;
+			color: #9c7557;
+			image {
+				width: 340rpx;
+				height: 280rpx;
+				margin-bottom: 30rpx;
+			}
+			.campusTips-cont-go {
+				display: inline-block;
+				border: #9c7557 2rpx solid;
+				line-height: 66rpx;
+				padding: 0 40rpx;
+				margin-top: 30rpx;
+				font-size: 28rpx;
+				border-radius: 90rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/password.vue b/pages/giftPack/password.vue
new file mode 100644
index 0000000..017cf1f
--- /dev/null
+++ b/pages/giftPack/password.vue
@@ -0,0 +1,232 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="/static/img/campus_logo.jpg" mode="aspectFill"></image>
+				<view class="title">身份验证</view>
+			</view>
+			<image class="cover" src="/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<button class="campus-form-btn" form-type="submit">设置新密码</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+		
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || ''
+					
+				auth({
+					mobile: mobileNo,
+					code: code,
+					type: 'reset_password'
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.redirectTo({
+						url: '/pages/giftPack/setPassword'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+				border-radius: 50%;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/register.vue b/pages/giftPack/register.vue
new file mode 100644
index 0000000..51141ae
--- /dev/null
+++ b/pages/giftPack/register.vue
@@ -0,0 +1,239 @@
+<template>
+	<view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campus_logo.jpg" mode="aspectFill"></image>
+				<view class="title">超级红包活动用户注册</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+	    <view class="campus-cont">
+	        <form @submit="submitRegister">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue"
+				        name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请输入密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请确认密码" name="password_confirmation"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">注册</button>
+	        </form>
+	    </view>
+	</view>
+</template>
+
+<script>
+    import { send, register } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{
+						uni.showToast({
+						    title   : err.message,
+							icon	:'none',
+						    duration: 2000
+						})
+					})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            submitRegister(e){
+				let formValue = e.detail.value
+				
+				register({
+					mobile					: formValue.mobile,
+					password				: formValue.password,
+					password_confirmation	: formValue.password_confirmation,
+					code					: this.code,
+					parent_id				: 0
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.showModal({
+						title		: "提示",
+						content		: "注册成功",
+						showCancel	: false,
+						confirmText : "确定",
+						success		: modalRes => {
+							if(modalRes.confirm){
+								uni.reLaunch({
+								    url: '/pages/giftPack/index'
+								})
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+				border-radius: 50%;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/setPassword.vue b/pages/giftPack/setPassword.vue
new file mode 100644
index 0000000..c18cdec
--- /dev/null
+++ b/pages/giftPack/setPassword.vue
@@ -0,0 +1,170 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campus_logo.jpg" mode="aspectFill"></image>
+				<view class="title">设置新密码</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="设置新的登录密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="确认新的登录密码" name="newpassword"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">确定</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { passSetup } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+            }
+        },
+        methods: {
+            // 立即登录
+            forgetlogin(e){
+                let newPass  = e.detail.value.newpassword || '',
+					password = e.detail.value.password || ''
+				
+				passSetup({
+					password: password,
+					password_confirmation: newPass
+				}).then(res => {
+					uni.showToast({
+						title: "密码重置成功",
+						icon : 'none'
+					})
+					uni.reLaunch({
+					    url: '/pages/giftPack/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+				border-radius: 50%;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/signin.vue b/pages/giftPack/signin.vue
new file mode 100644
index 0000000..b53e0ba
--- /dev/null
+++ b/pages/giftPack/signin.vue
@@ -0,0 +1,260 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campus_logo.jpg" mode="aspectFill"></image>
+				<view class="title">超级红包活动登录</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/campus_login_02.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code" v-if="!passwordLogin">
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs" v-else>
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="password" placeholder="请输入登录密码" name="password"></input>
+				</view>
+				<view class="resPassword">
+					<navigator url="password">忘记密码</navigator>
+				</view>
+				<button class="campus-form-btn" form-type="submit">登录</button>
+            </form>
+			<view class="login-box">
+				<view @click="onCutLogin">{{passwordLogin ? '验证码登录': '密码登录'}}</view>
+				<navigator url="register">快速注册</navigator>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth, passlogin } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+				passwordLogin: true, // 登录方式
+                disabled     : false,
+            }
+        },
+        
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]|16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || '',
+					password = e.detail.value.password || '',
+					loginFunction
+				
+				if(this.passwordLogin){
+					loginFunction = passlogin({
+						mobile	: mobileNo,
+						password: password
+					})
+				}else{
+					loginFunction = auth({
+						mobile: mobileNo,
+						code: code,
+						type: ''
+					})
+				}
+				
+				loginFunction.then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/giftPack/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 90rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+			navigator{
+				display: inline-block;
+			}
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+				border-radius: 50%;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/giftPack/user.vue b/pages/giftPack/user.vue
new file mode 100644
index 0000000..7c2a3aa
--- /dev/null
+++ b/pages/giftPack/user.vue
@@ -0,0 +1,380 @@
+<template>
+	<view class="content">
+		<view class="content-border">
+			<view class="user">
+				<view class="userTop">
+					<view class="userTop-name" v-if="isUser">
+						<block v-if="userData.info"><text>用户</text>{{userData.info.username}}</block>
+					</view>
+					<navigator hover-class="none" url="/pages/giftPack/signin" class="userTop-name" v-else>请先登录</navigator>
+					<!-- <view class="userTop-text">感谢您参加本事礼包活动</view> -->
+				</view>
+				<view class="userItem">
+					<!-- <view class="userItem-label">
+						<view class="userItem-label-number">
+							<image class="userItem-label-img" src="@/static/img/giftPack-img02.png" mode="widthFix"></image><text>23</text>
+						</view>
+						<view class="userItem-label-text">总余额</view>
+					</view> -->
+					<view class="userItem-label">
+						<view class="userItem-label-number">
+							<block v-if="isUser">
+								<image class="userItem-label-img" src="@/static/img/giftPack-img03.png" mode="widthFix"></image>
+								<block v-if="userData.gold"><text>{{userData.gold.balance ? userData.gold.balance : '0'}}</text></block>
+							</block>
+							<block v-else>
+								<image class="userItem-label-img" src="@/static/img/giftPack-img03.png" mode="widthFix"></image>
+								<text>0</text>
+							</block>
+						</view>
+						<view class="userItem-label-text">可用余额</view>
+					</view>
+					<view class="userItem-label">
+						<view class="userItem-label-number">
+							<block v-if="isUser">
+								<image class="userItem-label-img" src="@/static/img/giftPack-img04.png" mode="widthFix"></image>
+								<block v-if="userData.gold"><text>{{userData.gold.overdue ? userData.gold.overdue : '0'}}</text></block>
+							</block>
+							<block v-else>
+								<image class="userItem-label-img" src="@/static/img/giftPack-img03.png" mode="widthFix"></image>
+								<text>0</text>
+							</block>
+						</view>
+						<view class="userItem-label-text">已过期</view>
+					</view>
+				</view>
+				<view class="userList" @click="userNav('/pages/giftPack/logs')">
+					<image class="userList-img" src="@/static/img/giftPack-img05.png" mode="widthFix"></image>
+					<view class="userList-text">查看余额详细记录</view>
+				</view>
+				<view class="userTips">
+					<view class="userTips-left">
+						余额账户
+					</view>
+					<!-- <view class="userTips-right">
+						本时生活<text>·</text>礼包活动
+					</view> -->
+				</view>
+				<image class="userBack" src="@/static/img/giftPack-img01.png" mode="widthFix"></image>
+			</view>
+			
+			<view class="userCoupon" @click="userNav('/pages/giftPack/myCoupon')">
+				<image class="userCoupon-img" src="@/static/img/giftPack-img06.png" mode="widthFix"></image>
+				<view class="userCoupon-cont">
+					<view class="userCoupon-name">我的优惠券</view>
+					<image class="userCoupon-arrow" src="@/static/icon/rightsArrow.png" mode="widthFix"></image>
+				</view>
+			</view>
+			
+			<view class="userTool">
+				<view class="userTool-title">
+					其他功能
+				</view>
+				<view class="userTool-item" @click="userNav('/pages/giftPack/setPassword')">
+					<image class="userTool-img" src="@/static/img/giftPack-img08.png" mode="widthFix"></image>
+					<view class="userTool-cont">
+						<view class="userTool-name">修改密码</view>
+						<image class="userTool-arrow" src="@/static/icon/rightsArrow.png" mode="widthFix"></image>
+					</view>
+				</view>
+				<view class="userTool-item" @click="delStorage">
+					<image class="userTool-img" src="@/static/img/giftPack-img07.png" mode="widthFix"></image>
+					<view class="userTool-cont">
+						<view class="userTool-name">退出登录</view>
+						<image class="userTool-arrow" src="@/static/icon/rightsArrow.png" mode="widthFix"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 按钮 -->
+		<view class="campusBtn">
+			<navigator url="/pages/giftPack/index" hover-class="none" class="campusBtn-go">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user00.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					活动首页
+				</view>
+			</navigator>
+			<navigator url="/pages/giftPack/user" hover-class="none" class="campusBtn-go active">
+				<image class="campusBtn-iocn" src="/static/img/giftPack-user01_active.png" mode="widthFix"></image>
+				<view class="campusBtn-name">
+					个人中心
+				</view>
+			</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { index } from '@/apis/interfaces/user'
+	export default {
+	    data() {
+	        return {
+				isUser  : false,  // 用户是否登录
+				userData: '', //用户
+	        }
+	    },
+	    
+	    // 生命周期函数--监听页面加载
+	    onLoad(options) {},
+	
+	    // 生命周期函数--监听页面显示
+	    onShow() {
+	        // 存储环境-月兑活动
+	        getApp().globalData.envType = 'giftPEnv'
+			
+			if(uni.getStorageSync("token")) {
+				this.isUser = true
+				// 获取用户接口
+			    this.userInfo();
+			}
+	        
+	    },
+	    methods: {
+			// 用户接口
+			userInfo() {
+				// 获取用户信息
+				index().then(res => {
+				    this.userData = res
+				}).catch(err => {
+				    if (!err.login) {
+				        uni.showModal({
+				            title: '用户登录已过期',
+				            content: '请重新登录',
+				            showCancel: false,
+				            success: res => {
+				                if (res.confirm) {
+				                    uni.redirectTo({
+				                        url: '/pages/giftPack/signin'
+				                    });
+				                }
+				            }
+				        });
+				    }
+				});
+			},
+			
+	        // 处理未登录时的转跳
+	        userNav(url){
+	            let pageUrl = url
+	            if(uni.getStorageSync("token")) {
+	                uni.navigateTo({
+	                    url: pageUrl
+	                })
+	                return
+	            }
+	            // 去登录
+	            uni.navigateTo({
+	                url: '/pages/giftPack/signin'
+	            })
+	        },
+			
+			// 退出登录
+			delStorage() {
+			    uni.clearStorage()
+			    uni.navigateTo({
+			        url:'/pages/giftPack/signin'
+			    })
+			}
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		padding: 80rpx 30rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.content-border {
+		border-bottom: 130rpx transparent solid;
+	}
+	
+	.user {
+		background-image: linear-gradient(110deg, #ecdec4, #f6efe2);
+		border-radius: 10rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: relative;
+		.userBack {
+			position: absolute;
+			right: 20rpx;
+			top: -60rpx;
+			width: 190rpx;
+		}
+		.userTop {
+			color: #80622a;
+			.userTop-name {
+				display: flex;
+				font-size: 46rpx;
+				line-height: 54rpx;
+				font-weight: 600;
+				text {
+					font-size: 28rpx;
+					padding-right: 20rpx;
+					padding-top: 6rpx;
+				}
+			}
+			.userTop-text {
+				font-size: 26rpx;
+				color: #bc903d;
+			}
+		}
+		.userItem {
+			margin: 30rpx 0;
+			background-color: #f7f1e5;
+			border-radius: 10rpx;
+			display: flex;
+			padding: 30rpx 0;
+			.userItem-label {
+				flex: 2;
+				text-align: center;
+				.userItem-label-number {
+					.userItem-label-img {
+						width: 40rpx;
+						margin-right: 15rpx;
+						display: inline-block;
+						vertical-align: -4rpx;
+					}
+					text {
+						font-weight: 600;
+						font-size: 40rpx;
+					}
+				}
+				.userItem-label-text {
+					color: #8f6d2f;
+					font-size: 26rpx;
+					padding-top: 10rpx;
+				}
+			}
+		}
+		.userList {
+			background-color: #f7f1e5;
+			border-radius: 10rpx;
+			display: flex;
+			padding: 30rpx 20rpx;
+			line-height: 60rpx;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			.userList-img {
+				width: 60rpx;
+				margin-right: 20rpx;
+				color: #000000;
+			}
+		}
+		.userTips {
+			width: 100%;
+			color: #cca762;
+			display: flex;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			line-height: 30rpx;
+			.userTips-left {
+				flex: 1;
+			}
+			.userTips-right {
+				text {
+					font-size: 32rpx;
+					font-weight: 600;
+					padding: 0 8rpx;
+				}
+			}
+		}
+	}
+	
+	.userCoupon {
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding: 30rpx 15rpx 30rpx 30rpx;
+		margin: 30rpx 0;
+		box-sizing: border-box;
+		display: flex;
+		.userCoupon-img {
+			width: 60rpx;
+			margin-right: 20rpx;
+		}
+		.userCoupon-cont {
+			width: calc(100% - 80rpx);
+			line-height: 58rpx;
+			display: flex;
+			.userCoupon-name {
+				flex: 1;
+				font-size: 32rpx;
+				font-weight: 600;
+			}
+			.userCoupon-arrow {
+				width: 44rpx;
+				margin-top: 8rpx;
+			}
+		}
+	}
+	
+	.userTool {
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding: 30rpx 15rpx 30rpx 30rpx;
+		margin: 30rpx 0;
+		box-sizing: border-box;
+		.userTool-title {
+			font-size: 32rpx;
+			font-weight: 600;
+			margin-bottom: 40rpx;
+		}
+		.userTool-item {
+			display: flex;
+			border-bottom: 2rpx solid #f8f8f8;
+			padding-bottom: 40rpx;
+			margin-bottom: 40rpx;
+			&:last-child {
+				padding-bottom: 10rpx;
+				margin-bottom: 0;
+				border: none;
+			}
+			.userTool-img {
+				width: 40rpx;
+				margin-right: 20rpx;
+				margin-top: 6rpx;
+			}
+			.userTool-cont {
+				width: calc(100% - 60rpx);
+				line-height: 50rpx;
+				display: flex;
+				.userTool-name {
+					flex: 1;
+					font-size: 32rpx;
+				}
+				.userTool-arrow {
+					width: 44rpx;
+					margin-top: 8rpx;
+				}
+			}
+		}
+	}
+	
+	// 按钮
+	.campusBtn {
+	    text-align: center;
+	    color: #FFFFFF;
+		background-color: #fff;
+		display: flex;
+		position: fixed;
+		width: 100%;
+		height: 130rpx;
+		z-index: 999;
+		left: 0;
+		bottom: 0;
+		font-size: 28rpx;
+		.campusBtn-go {
+			flex: 2;
+			padding-top: 20rpx;
+			.campusBtn-iocn {
+				width: 44rpx;
+			}
+			.campusBtn-name {
+				color: #abaeb2;
+			}
+			&.active .campusBtn-name {
+				color: #2b3452;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..55ef479
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,1113 @@
+<template>
+	<view>
+		<!-- 定位 -->
+        <view class="locationPicker">
+            <image class="locationPicker-icon" src="/static/icon/indexSite.png"></image>
+            <navigator :url="'../switchcity/switchcity?city_code=' + address.cityCode + '&area_code=' + address.provinceCode + '&city=' + address.cityName + '&area=' + address.districtName" hover-class="none" class="cityCont">
+                <view class="nowrap">
+                    <text>{{ address.cityName }}{{ address.districtName }}</text>
+                </view>
+                <image src="/static/img/arrow.png"></image>
+            </navigator>
+        </view>
+        
+        <!-- 首页tab -->
+        <view class="indexTab">
+            <view class="indexTab-lable" :class="{active : stateType == 'shaky'}" data-state="shaky" @click="orderTab">
+                活动中心
+            </view>
+            <view class="indexTab-lable" :class="{active : stateType == 'silver'}" data-state="silver" @click="orderTab">
+                白金会员
+            </view>
+            <view class="indexTab-lable" :class="{active : stateType == 'drill'}" data-state="drill" @click="orderTab">
+                钻石会员
+            </view>
+        </view>
+        <view class="indexTop">
+            <!-- 卡片轮播 -->
+            <view class="indexBanner">
+                <view class="banner" v-if="content.adverts.length > 0">
+                    <swiper class="banner-swiper" interval="3000" autoplay :current="content.current" @change="swiperChange">
+                        <swiper-item v-for="(item, index) in content.adverts" :key="index">
+                            <image class="banner-img" :src="item.cover" show-menu-by-longpress="true" mode="aspectFill"
+                                @click="clickImg(item.qrcode, item.url, item.channel)">
+                            </image>
+                            <i class="light"></i>
+                        </swiper-item>
+                    </swiper>
+                </view>
+            </view>
+            
+            <!-- 自定义轮播图进度点 -->
+            <view class="dots" v-if="content.adverts.length > 0">
+                <block v-for="(item, index) in content.adverts" :key="index">
+                    <view :class="{active : index == content.swiperCurrent}"></view>
+                </block>
+            </view>
+            
+            <!-- 公告 -->
+            <view class="indexNews">
+                <image src="/static/icon/news_icon.png"></image>
+                <view class="marquee_container" style="--marqueeWidth--:-30em">
+                    <view class="marquee_text" :class="{active : content.noticeData.length > 20}">{{ content.noticeData }}</view>
+                </view>
+            </view>
+            
+            <!-- 活动中心-权益列表 -->
+            <view class="cardArr" v-if="stateType == 'shaky'">
+                <view class="cardArr-top">
+                    <block v-if="content.cardArr.length > 0">
+                        <view @click="rightNav(item.right_config_id, item.right_config_id, item.from)" v-for="(item, index) in content.cardArr" :key="index" class="indexCard">
+                            <image class="indexCard-img" :src="item.cover"></image>
+                            <view class="nowrap indexCard-title">{{ item.title }}</view>
+                            <view class="nowrap activity-remark" v-if="item.subtitle != null">
+                                <text class="nowrap">{{ item.subtitle }}</text>
+                            </view>
+                            <view class="activity-tips" v-if="item.label">{{ item.label }}</view>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <view class="legalTips">
+                            <image src="/static/img/legal_tips.png"></image>
+                            <text>抱歉, 此地区暂无权益</text>
+                        </view>
+                    </block>
+                </view>
+    
+                <!-- 福利日 -->
+                <view class="WelfareCont" v-if="content.activities.length > 0">
+                    <view class="WelfareTop">
+                        <image class="welfare_stra" src="https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_stra.png"></image>
+                        <image class="welfare-title" src="https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_title.png"></image>
+                    </view>
+                    <view class="WelfareTitle"><text>{{ content.activities.length }}</text> 大会员权益，福利全线升级</view>
+                    <view class="WelfareList" v-for="(item, index) in content.activities" :key="index" @click="Snapup(item.code_text, item.canBuy, item.welfare_id, item.right.from, item.right.right_config_id)">
+                        <image class="WelfareList-img" :class="{active : item.surplus == 0}" :src="item.right.from == 'washcar' ? 'https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_back_00.png' : 'https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_back_01.png'"></image>
+                        <view class="WelfareList-back">
+                            <image class="WelfareList-left" :class="{active : item.surplus == 0}" :src="item.right.from == 'washcar' ? 'https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_icon_00.png' : 'https://card.ysd-bs.com/storage/materials/2021/09/01/welfare_icon_01.png'"></image>
+                            <view class="WelfareList-center">
+                                <view class="nowrap WelfareList-price">{{ item.price }}<text> 元</text>（{{item.title}}）</view>
+                                <view class="WelfareList-center-all" :class="{active : item.surplus == 0}">
+                                    <text>[限量{{ item.stock }}份]</text> <text>[剩余{{ item.surplus }}份]</text>
+                                </view>
+                                <view class="WelfareList-center-time" :class="{active : item.surplus == 0}">
+                                    <text>{{ item.start_time }} 开抢</text><text>{{ item.end_time }} 结束</text>
+                                </view>
+                            </view>
+                            <view class="WelfareList-right" :class="{active : item.surplus == 0}">
+                                <text>抢购</text>
+                            </view>
+                        </view>
+                    </view>
+                    <template>
+                        <view class="subscribe" v-if="content.subState">
+                            <view class="subscribe-icon">
+                                <image class="subscribe-icon-one" src="/static/static/img/finger_00.png"></image>
+                                <image class="subscribe-icon-two" src="/static/static/img/finger_01.png"></image>
+                            </view>
+                            <view class="subscribe-cont">
+                                <wx-open-subscribe :template="templateIds" id="subscribe-btn" ref="subscribeBtn">
+                                    <script type="text/wxtag-template" slot="style">
+                                        <style>
+                                            .subscribe-txt{
+                                                color: #89663f;
+                                                font-weight: bold;
+                                                -webkit-animation: subscribeCont 1s linear infinite;
+                                                animation: subscribeCont 1s linear infinite;
+                                                display: inline-block;
+                                                height: 40px;
+                                                width: 160px;
+                                                text-align: center;
+                                                line-height: 40px;
+                                            }
+                                            @keyframes subscribeCont {
+                                                25% {
+                                                    transform: scale(.98);
+                                                }
+                                                50%,
+                                                100% {
+                                                    transform: scale(1);
+                                                }
+                                                75% {
+                                                    transform: scale(1.05);
+                                                }
+                                            }
+                                        </style>
+                                    </script>
+                                    <script type="text/wxtag-template">
+                                        <view class="subscribe-txt">点击消息提醒</view>
+                                    </script>
+                                </wx-open-subscribe>
+                            </view>
+                        </view>
+                    </template>
+                </view>
+            </view>
+            
+            <!-- 白金会员&钻石会员-权益列表 -->
+            <view class="cardArr" v-else>
+                <view class="cardArr-top">
+                    <block v-if="content.rightArr.length > 0">
+                        <view @click="userNav(item.category_id)" v-for="(item, index) in content.rightArr" :key="index"
+                            class="indexCard">
+                            <image class="indexCard-img" :src="item.cover"></image>
+                            <view class="nowrap indexCard-title">{{ item.title }}</view>
+                            <view class="nowrap indexCard-remark" v-if="item.description != null">{{ item.description }}
+                            </view>
+                            <view class="activity-tips indexCard-tips" v-if="item.label != ''">{{ item.label }}</view>
+                        </view>
+                    </block>
+                    <block v-else>
+                        <view class="legalTips">
+                            <image src="/static/img/legal_tips.png"></image>
+                            <text>抱歉, 此地区暂无权益</text>
+                        </view>
+                    </block>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 漂浮窗 -->
+        <movable-area class="indexFloat">
+        	<movable-view y="340" direction="vertical" class="indexFloat-movable">
+        		<view @tap="userUrl" :data-url="'/pages/favour/favour'" class="indexFloat-img">
+        			<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/index_float_00.png"
+        				mode="aspectFill" class="indexFloat-animation"></image>
+        		</view>
+        		<view @tap="userUrl" :data-url="'/pages/code/code'" class="indexFloat-img">
+        			<image src="https://card.ysd-bs.com/storage/materials/2021/09/01/index_float_01.png" mode="aspectFill"></image>
+        		</view>
+        	</movable-view>
+        </movable-area>
+	</view>
+</template>
+
+<script>
+    const jweixin = require('jweixin-module');
+    import { activity, index, subscribeUrl, subscribeH5 } from '@/apis/interfaces/index'
+    import { washcarUrl } from '@/apis/interfaces/rights'
+	export default {
+		data() {
+			return {
+				address : {
+                    cityName       : "",  // 市名称
+                    districtName   : "",  // 区名称
+                    cityCode       : "",  // 市编号
+                    provinceCode   : ""   // 区编号
+                },
+                location: {
+                    latitude : '',  // 纬度
+                    longitude: ''   // 经度
+                },
+                stateType: "silver", // tab状态名称 shaky为活动中心  silver为白金会员  drill为钻石会员
+                content: {
+                    swiperCurrent : 0,
+                    current       : 0,  // 轮播图当前的下标
+                    adverts       : [], // 轮播列表
+                    noticeData    : [], // 公告列表
+                    cardArr       : [], // 活动权益列表
+                    rightArr      : [], // 白金会员&钻石会员权益列表
+                    activities    : [], // 周五福利日
+                    subState      : ''  // 订阅状态
+                },
+                templateIds: 'R9LbtDjg9sC-o3xUS2kDcSQ9MS4I67LnacAS8Fsmxpo'
+			}
+		},
+		onLoad(options) {
+            if(options.type){
+                getApp().globalData.shareObj = {
+                    type    : options.type,
+                    goodsId : '',
+                    userId  : options.parent_id
+                }
+            }
+        },
+        onShow() {
+            // 获取定位信息
+            this.locaTion()
+        },
+		methods: {
+            // 获取H5config 基本信息
+            getH5Info() {
+                subscribeUrl({
+                    url: location.href.split('#')[0],
+                    list: ['chooseWXPay', ],
+                    openTagList: ['wx-open-subscribe']
+                }).then(res => {
+                    let takeData = JSON.parse(res)
+                    jweixin.config({
+                        debug: false,
+                        appId: takeData.appId,
+                        timestamp: takeData.timestamp,
+                        nonceStr: takeData.nonceStr,
+                        signature: takeData.signature,
+                        jsApiList: ['wx-open-subscribe', 'wx-open-launch-app', 'launchAppLication'],
+                        openTagList: ['wx-open-subscribe', 'wx-open-launch-app',
+                            'wx-open-subscribe-dialog'
+                        ]
+                    })
+                    jweixin.ready(() => {
+                        this.$nextTick(() => {
+                            const btn = this.$refs.subscribeBtn;
+                            btn.addEventListener('success', ({
+                                detail
+                            }) => {
+                                let subscribeState = JSON.parse(detail.subscribeDetails); // 全部模板
+                                for(let val in subscribeState){
+                                    let new_subscribeState = subscribeState[val];     // 获取每个模板状态
+                                    let new_status = JSON.parse(new_subscribeState);
+                                    switch (new_status.status) {
+                                        case "reject":
+                                            uni.showToast({
+                                                title: '用户拒绝订阅',
+                                                icon : 'none'
+                                            })
+                                            break;
+                                        case "accept":
+                                            subscribeH5(1).then((subscribeRes) => {
+                                                uni.showLoading({
+                                                    title: subscribeRes,
+                                                    icon: 'none',
+                                                })
+                                                setTimeout(function() {
+                                                    uni.hideLoading();
+                                                }, 1000)
+                                            })
+                                        break;
+                                        default:
+                                            uni.showToast({
+                                                title: '用户取消订阅',
+                                                icon : 'none'
+                                            })
+                                        break;
+                                    }
+                                }
+                            });
+                            btn.addEventListener('error', (err) => {
+                                uni.showToast({
+                                    title: err,
+                                    icon : 'none'
+                                })
+                            })
+                        })
+                    })
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                })
+            },
+
+            // 权益信息
+            indexInfo(){
+                // 钻石+白金权益内容
+                let dataUrl = index
+                // 活动权益内容
+                if(this.stateType == 'shaky') dataUrl = activity
+                dataUrl({
+                    type     : this.stateType,
+                    area_name: this.address.cityName,
+                    user_lat : this.location.latitude,
+                    user_lng : this.location.user_lng
+                }).then(res => {
+                    this.content.adverts     = res.adverts                    // 轮播
+                    this.address.cityName    = res.location.city_name || '',  // 市名称
+                    this.address.districtName= res.location.district_name || '',// 区名称
+                    this.address.cityCode    = res.location.city_id || '',    // 市编号
+                    this.address.provinceCode= res.location.province_id || '' // 区编号
+                    this.content.noticeData  = res.notice                     // 公告
+                    this.content.rightArr    = res.categorys || ''            // 白金会员&钻石会员权益列表
+                    this.content.cardArr     = res.rights || ''               // 权益列表
+                    this.content.activities  = res.activities || ''           // 周五福利日
+                    this.content.subState    = res.welfare_subscribe          // 周五福利订阅
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            },
+            
+            // 获取位置
+            locaTion(){
+                uni.getLocation({
+                    type    : 'wgs84',
+                    success : res=> {
+                        this.location.latitude  = res.latitude,
+                        this.location.longitude = res.longitude
+                    },
+                    complete: () => {
+                        // 获取权益信息
+                        this.indexInfo();
+                    }
+                })
+            },
+            
+            // 活动中心权益跳转详情
+            rightNav(newId, newRight, newFrom) {
+                // 是否登录
+                if(uni.getStorageSync("token")) {
+                    if(newFrom == 'washcar') {
+                        washcarUrl({
+                            welfare_id: newId,
+                            right_config_id: newRight
+                        }).then(res=>{
+                            const newUrl = res
+                            // #ifdef H5
+                            window.location.href = newUrl
+                            // #endif
+                        })
+                    } else {
+                        // 跳转分类页
+                        uni.navigateTo({
+                            url: '/pages/rights/index?id=' + newRight
+                        })
+                    }
+                } else {
+                    uni.navigateTo({
+                        url: "/pages/auth/login"
+                    })
+                }
+            },
+            
+            // 白金和钻石会员权益
+            userNav(id) {
+                let user_lng  = this.location.longitude,  // 经度
+                    user_lat  = this.location.latitude,   // 纬度
+                    area_name = this.address.cityName     // 市名称
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: '/pages/classify/classify?id=' + id + '&userlng=' + user_lng + '&latitude=' + user_lat + '&areaname=' + area_name
+                    })
+                    return
+                }
+                uni.navigateTo({
+                    url: "/pages/auth/login"
+                })
+            },
+            
+            // 周五福利跳转
+            Snapup(text, canBuy, welfarId, canFrom, rightId) {
+                if(!canBuy) {
+                    uni.showToast({
+                        title   : text,
+                        icon    : 'none',
+                        duration: 2000
+                    })
+                    return
+                }
+                // 是否登录
+                if(uni.getStorageSync("token")) {
+                    if(canFrom == 'washcar') {
+                        washcarUrl({
+                            welfare_id: welfarId,
+                            right_config_id: rightId
+                        }).then(res=>{
+                            const newUrl = res
+                            // #ifdef H5
+                            window.location.href = newUrl
+                            // #endif
+                        })
+                    } else {
+                        // 跳转福利详情
+                        uni.navigateTo({
+                            url: '/pages/welfare/welfare?id=' + welfarId
+                        })
+                    }
+                } else {
+                    uni.navigateTo({
+                        url: "/pages/auth/login"
+                    })
+                }
+            },
+            
+            // 卡身份tabs
+            orderTab(e){
+                let newState = e.currentTarget.dataset.state
+                if(this.stateType != newState){
+                    this.stateType = newState
+                    
+                    if (this.stateType == 'shaky') {
+                        this.getH5Info()
+                    }
+                    // 获取卡权益
+                    this.indexInfo();
+                    
+                    // 重置轮播图
+                    this.content.swiperCurrent= 0
+                    this.content.current      = 0
+                }
+            },
+            
+            // 点击轮播图片放大
+            clickImg(qrcode, url, channel) {
+                let newImg     = qrcode,
+                    newUrl     = url,
+                    newChannel = channel
+                // 点击图片放大
+                if (newChannel == 'image') {
+                    if(newImg == "") return
+                    let imgUrl = [newImg]
+                    uni.previewImage({
+                        urls        :  imgUrl, //需要预览的图片http链接列表，注意是数组
+                        current     :  imgUrl[0] // 当前显示图片的http链接，默认是第一个
+                    }) 
+                }
+                // 跳转内网
+                if (newChannel == 'pages') {
+                    uni.navigateTo({
+                      url: newUrl
+                    })
+                }
+                // 跳转外网
+                if (newChannel == 'url') {
+                    // #ifdef H5
+                    window.location.href = newUrl
+                    // #endif
+                }
+            },
+            
+            // 防止swiper控件卡死
+            swiperChange(e){
+                if (this.content.current == 0 && this.content.swiperCurrent>1 ) {
+                    // 卡死时，重置current为正确索引
+                    this.content.current = this.content.swiperCurrent
+                }
+                else {
+                    // 正常轮转时，记录正确页码索引
+                    this.content.swiperCurrent = e.detail.current
+                }
+            },
+            
+            // 周五福利订阅
+            subscribeTap() {},
+            
+            // 处理未登录时的转跳
+            userUrl(e){
+                let pageUrl = e.currentTarget.dataset.url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                } else {
+                    // 去登录
+                    uni.navigateTo({
+                        url: "/pages/auth/login"
+                    })
+                }
+            },
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* 定位 */
+	.locationPicker {
+        padding-top: var(--status-bar-height);
+	    background: #000;
+	    color: #fff;
+	    height: 80rpx;
+	    line-height: 80rpx;
+	    position: fixed;
+	    width: 100%;
+	    z-index: 1009;
+	    top: 0;
+	    left: 0;
+        .locationPicker-icon {
+            width: 38rpx;
+            height: 38rpx;
+            float: left;
+            vertical-align: middle;
+            margin: 22rpx 10rpx 0 20rpx;
+        }
+        .cityCont {
+            width: 60%;
+            display: flex;
+            view {
+                max-width: calc(100% - 50rpx);
+            }
+            image {
+                width: 50rpx;
+                height: 50rpx;
+                margin-top: 16rpx;
+            }
+        }
+	}
+    
+    // 首页tab
+    .indexTab {
+        position: fixed;
+        display: flex;
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+        z-index: 99999;
+        padding: 0 40rpx;
+        top: calc(var(--status-bar-height) + 80rpx);
+        box-sizing: border-box;
+        background-color: #07081d;
+        .indexTab-lable {
+            text-align: center;
+            flex: 3;
+            color: #fff;
+            position: relative;
+            &.active {
+                background-image: -webkit-linear-gradient(left, #e4dab7, #d9b672);
+                -webkit-background-clip: text;
+                -webkit-text-fill-color: transparent;
+                font-weight: 600;
+                font-size: 38rpx;
+            }
+        }
+    }
+    
+    // 内容
+    .indexTop {
+        padding-top: calc(var(--status-bar-height) + 160rpx);
+        // 轮播图
+        .indexBanner {
+            height: 360rpx;
+            position: relative;
+            padding-top: 20rpx;
+            &::after {
+                position: absolute;
+                left: 0;
+                top: 0;
+                height: 240rpx;
+                width: 100%;
+                content: '';
+                background: #07081d;
+                border-radius: 0 0 200rpx 200rpx;
+            }
+            .banner {
+                position: relative;
+                padding-top: 48%;
+                width: calc(100% - 100rpx);
+                background: white;
+                margin: 0 50rpx;
+                border-radius: 30rpx;
+                overflow: hidden;
+                z-index: 99;
+                .banner-swiper {
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    .banner-img {
+                        width: 100%;
+                        height: 100%;
+                        vertical-align: top;
+                    }
+                }
+            }
+        }
+        
+        /* 指示点 */
+        .dots {
+            margin: 30rpx 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            view {
+                width: 14rpx;
+                height: 14rpx;
+                margin: 0 6rpx;
+                border-radius: 50%;
+                background-color: #c5c5c5;
+                &.active {
+                    width: 24rpx;
+                    border-radius: 40rpx;
+                    background-color: #f46851;
+                }
+            }
+        }
+        
+        // 公告
+        .indexNews {
+            background: #dddddd;
+            padding: 25rpx 40rpx;
+            display: flex;
+            font-size: 28rpx;
+            image {
+                width: 34rpx;
+                height: 34rpx;
+                margin: 4rpx 20rpx 0 0;
+            }
+        }
+    }
+    
+    /* 权益列表 */
+    .cardArr {
+        padding: 50rpx 0 30rpx;
+        box-sizing: border-box;
+        overflow: hidden;
+        .cardArr-top {
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            flex-wrap: wrap;
+            display: flex;
+            margin-bottom: 20rpx;
+            .indexCard {
+                width: 33.33%;
+                text-align: center;
+                position: relative;
+                flex: 0 0 33.3333%;
+                margin-bottom: 40rpx;
+                .indexCard-img {
+                    width: 140rpx;
+                    height: 140rpx;
+                    border-radius: 50%;
+                }
+                .indexCard-title {
+                    font-weight: 600;
+                    margin: 5rpx 20rpx;
+                    font-size: 30rpx;
+                }
+                .indexCard-remark {
+                    font-size: 26rpx;
+                    color: #8a8a8a;
+                }
+                .activity-remark {
+                    background-color: #000000;
+                    display: inline-block;
+                    border-radius: 40rpx;
+                    height: 38rpx;
+                    line-height: 38rpx;
+                    padding: 0 10rpx;
+                }
+                .activity-remark text {
+                    display: block;
+                    background-image: -webkit-linear-gradient(left, #e4dab7, #d9b672);
+                    -webkit-background-clip: text;
+                    -webkit-text-fill-color: transparent;
+                    font-size: 22rpx;
+                }
+                .activity-tips {
+                    position: absolute;
+                    top: -10rpx;
+                    right: 10rpx;
+                    z-index: 9;
+                    background-image: -webkit-linear-gradient(to left, #ff0000, #ff0000);
+                    background-image: -moz-linear-gradient(to left, #ff0000, #ff0000);
+                    background-image: linear-gradient(to left, #ff0000, #ff0000);
+                    color: #fff;
+                    font-size: 24rpx;
+                    padding: 0 18rpx;
+                    height: 40rpx;
+                    line-height: 40rpx;
+                    border-radius: 20rpx;
+                    animation: zy 2.5s .15s linear infinite;
+                    -moz-animation: zy 2.5s .15s linear infinite;
+                    -webkit-animation: zy 2.5s .15s linear infinite;
+                    -o-animation: zy 2.5s .15s linear infinite;
+                }
+                @keyframes zy {
+                    10% {
+                        transform: rotate(15deg);
+                    }
+                
+                    20% {
+                        transform: rotate(-10deg);
+                    }
+                
+                    30% {
+                        transform: rotate(5deg);
+                    }
+                
+                    40% {
+                        transform: rotate(-5deg);
+                    }
+                
+                    50%,
+                    100% {
+                        transform: rotate(0deg);
+                    }
+                }
+            }
+        }
+    }
+    
+    .WelfareCont {
+        background-color: #000;
+        border: #fcf9da 2rpx solid;
+        padding: 30rpx;
+        box-sizing: border-box;
+        border-radius: 30rpx 30rpx 10rpx 10rpx;
+        position: relative;
+        .WelfareTop {
+            position: absolute;
+            top: -20rpx;
+            left: calc(50% - 225rpx);
+            width: 450rpx;
+            height: 70rpx;
+            .welfare-title,
+            .welfare_stra {
+                width: 100%;
+                position: absolute;
+                left: 0;
+                top: 0;
+                height: 100%;
+            }
+            .welfare_stra {
+                height: 130%;
+                z-index: 2;
+                animation: star .3s ease-in infinite;
+            }
+            @keyframes star {
+                10% {
+                    opacity: 0;
+                }
+            
+                90% {
+                    opacity: 1;
+                }
+            }
+        }
+        .WelfareTitle {
+            width: 100%;
+            text-align: center;
+            margin-bottom: 30rpx;
+            font-size: 32rpx;
+            font-weight: 600;
+            padding-top: 50rpx;
+            color: #f1cb8c;
+            text {
+                font-size: 64rpx;
+            }
+        }
+        .WelfareList {
+            position: relative;
+            width: 100%;
+            padding-top: 35%;
+            margin-bottom: 30rpx;
+            &:last-child {
+                margin: 0;
+            }
+            .WelfareList-img {
+                border-radius: 15rpx;
+                overflow: hidden;
+                position: absolute;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+            }
+            .WelfareList-back {
+                position: absolute;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+                padding: 45rpx 40rpx;
+                box-sizing: border-box;
+                z-index: 8;
+                display: flex;
+                .WelfareList-left {
+                    width: 70rpx;
+                    height: 70rpx;
+                    margin-top: 6%;
+                }
+                .WelfareList-center {
+                    font-size: 24rpx;
+                    margin: 0 30rpx;
+                    width: calc(100% - 250rpx);
+                    .WelfareList-price {
+                        font-size: 30rpx;
+                        font-weight: 600;
+                    }
+                    .WelfareList-center-all {
+                        margin: 10rpx 0;
+                        color: #633c1b;
+                        font-weight: 600;
+                    }
+                    .WelfareList-center-time {
+                        position: relative;
+                        padding-top: 25rpx;
+                        color: #a37d4d;
+                        &::after {
+                            position: absolute;
+                            content: '';
+                            left: 0;
+                            top: 0;
+                            width: 60rpx;
+                            height: 6rpx;
+                            border-radius: 20rpx;
+                            background-color: #d68f0d;
+                        }
+                    }
+                    .WelfareList-center-time text,
+                    .WelfareList-center-all text {
+                        padding-right: 20rpx;
+                    }
+                }
+                .WelfareList-right {
+                    background: linear-gradient(to bottom, #e8b86d, #9d743e);
+                    -webkit-background-size: 200% 100%;
+                    -webkit-animation: masked-animation 2s infinite linear;
+                    color: #fff;
+                    height: 58rpx;
+                    line-height: 58rpx;
+                    font-size: 28rpx;
+                    width: 120rpx;
+                    text-align: center;
+                    border-radius: 40rpx;
+                    margin-top: 7%;
+                    &.active {
+                        background: linear-gradient(to bottom, #969696, #969696);
+                    }
+                    &.active text {
+                        -webkit-animation: mymove 0s infinite linear;
+                    }
+                    text {
+                        display: inline-block;
+                        animation:mymove 2s infinite;
+                        transform: scale(.9);
+                    }
+                    @keyframes mymove{
+                        0%{
+                            transform: scale(.9);
+                        }
+                        25%{
+                            transform: scale(1);
+                        }
+                        50%{
+                            transform: scale(.9);
+                        }
+                        75%{
+                            transform: scale(1);
+                        }
+                    }
+                }
+                @-webkit-keyframes masked-animation {
+                    0%  { background-position: 0 0;}
+                    100% { background-position: -100% 0;}
+                }
+            }
+            .WelfareList-img.active,
+            .WelfareList-left.active {
+                -webkit-filter: grayscale(100%);
+                -moz-filter: grayscale(100%);
+                -ms-filter: grayscale(100%);
+                -o-filter: grayscale(100%);
+                filter: grayscale(100%);
+                filter: gray;
+            }
+            .WelfareList-center-time.active,
+            .WelfareList-center-all.active {
+                color: #929292;
+            }
+            .WelfareList-center-time.active::after {
+                background-color: #cccccc;
+            }
+        }
+    }
+    
+    // 首页轮播光
+    .light {
+        cursor: pointer;
+        position: absolute;
+        left: -100%;
+        top: 0;
+        width: 40px;
+        height: 100%;
+        background: rgba(255, 255, 255, 0);
+        transform: skewx(25deg);
+        -webkit-transition: all .5s ease-in;
+        -moz-transition: all .5s ease-in;
+        -o-transition: all .5s ease-in;
+        transition: all .5s ease-in;
+        animation-name: example;
+        animation-duration: 3.5s;
+        animation-iteration-count: infinite;
+    }
+    @keyframes example {
+        0% {
+            left: -100%;
+            background: rgba(255, 255, 255, .4);
+        }
+    
+        50% {
+            left: -50%;
+            background: rgba(255, 255, 255, .7);
+        }
+    
+        100% {
+            left: 100%;
+            background: rgba(255, 255, 255, 0);
+        }
+    }
+    
+    /* 滚动  */
+    /*首页跑马灯效果*/
+    @keyframes around {
+        from {
+            margin-left: 60rpx;
+        }
+    
+        to {
+            /* var接受传入的变量 */
+            margin-left: var(--marqueeWidth--);
+        }
+    }
+    
+    .marquee_container {
+        width: calc(100% - 40rpx);
+        overflow: hidden;
+    }
+    
+    .marquee_container:hover {
+        /* 不起作用 */
+        animation-play-state: paused;
+    }
+    
+    .marquee_text {
+        font-size: 28rpx;
+        display: inline-block;
+        white-space: nowrap;
+    }
+    
+    .marquee_text.active {
+        animation-name: around;
+        animation-duration: 20s;
+        /*过渡时间*/
+        animation-iteration-count: infinite;
+        animation-timing-function: linear;
+    }
+    
+    // 周五订阅
+    .subscribe {
+        color: #89663f;
+        width: 100%;
+        padding: 0 100rpx;
+        display: inline-block;
+        box-sizing: border-box;
+        margin-top: 50rpx;
+        display: flex;
+        .subscribe-icon,
+        .subscribe-cont {
+            height: 80rpx;
+            text-align: center;
+            line-height: 80rpx;
+            position: relative;
+        }
+        .subscribe-icon {
+            width: 150rpx;
+            padding-left: 30rpx;
+            box-sizing: border-box;
+            background: linear-gradient(to right, #f3c988, #f9e0b8);
+            border-radius: 40rpx 0 0 40rpx;
+            &::after{
+                position: absolute;
+                content: '';
+                right: -50rpx;
+                top: 0;
+                width: 0;
+                height: 0;
+                border-bottom: 80rpx solid #f9e0b8;
+                border-right: 50rpx solid transparent;
+                z-index: 9;
+            }
+            image {
+                width: 54rpx;
+                height: 54rpx;
+                margin-top: 14rpx;
+            }
+            .subscribe-icon-one {
+                -webkit-animation: bounce-right 1s linear infinite;
+                animation: bounce-right 1s linear infinite;
+            }
+            @keyframes bounce-right {
+                25% {transform: translateX(-3px);}
+                50%, 100% {transform: translateX(0);}
+                75% {transform: translateX(3px);}
+            }
+            .subscribe-icon-two {
+                -webkit-animation: bounce-two 1s linear infinite;
+                animation: bounce-two 1s linear infinite;
+            }
+            @keyframes bounce-two {
+                25% {opacity: 0;transform: translateX(-3px);}
+                75% {opacity: 1;transform: translateX(3px);}
+            }
+        }
+        .subscribe-cont {
+            width: calc(100% - 150rpx);
+            background: linear-gradient(to right, #f3c988, #f9e0b8);
+            border-radius: 0 40rpx 40rpx 0;
+            font-weight: 600;
+            text {
+                display: inline-block;
+                -webkit-animation: subscribeCont 1s linear infinite;
+                animation: subscribeCont 1s linear infinite;
+            }
+            @keyframes subscribeCont {
+                25% {transform: scale(.98);}
+                50%, 100% {transform: scale(1);}
+                75% {transform: scale(1.05);}
+            }
+        }
+    }
+    
+    /* 权益提示 */
+    .legalTips {
+        text-align: center;
+        font-size: 28rpx;
+        color: #999;
+        padding: 80rpx;
+        margin: 0 auto;
+        image {
+            width: 240rpx;
+            height: 180rpx;
+            display: block;
+            margin: 0 auto 40rpx;
+        }
+    }
+    
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        height: 70%;
+        width: 110rpx;
+        right: 20rpx;
+        bottom: 180rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-movable {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 280rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-img image {
+        width: 130rpx;
+        height: 130rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .indexFloat-animation {
+        animation: shake 3s linear infinite;
+    }
+    
+    @keyframes shake {
+        70%, 80% {
+          transform: rotate(7deg);
+        }
+        75% {
+          transform: rotate(-7deg);
+        }
+       
+        65%,
+        85% {
+          transform: rotate(0);
+        }
+    }
+</style>
diff --git a/pages/oil/buy.vue b/pages/oil/buy.vue
new file mode 100644
index 0000000..84f6a9c
--- /dev/null
+++ b/pages/oil/buy.vue
@@ -0,0 +1,668 @@
+<template>
+    <view>
+        <!-- 按钮 -->
+        <view class="newrightsBtn" @tap="payment">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ rightData.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ rightData.total }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 卡券 -->
+        <view style="padding-bottom: 90px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png" mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+                                <image :src="item" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                        <view class="nowrap rightsCont-btn">
+                            {{ rightData.detail.four_title }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.goods_cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.five_title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{ rightData.detail.price }}</view>
+                        <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" @click="goodsNumber('plus')">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 收货地址 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                    <block v-if="rightData.detail.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="/static/img/new_rightsAddress.png"></image>
+                            <block v-if="rightData.addressSee != ''">
+                                <view class="rightsLabel-right" @tap="addressTap">
+                                    <view class="rightsLabel-address-text">
+                                        <view class="rightsLabel-address-name">{{ rightData.addressSee.name }}<view class="rightsLabel-address-tel">{{ rightData.addressSee.mobile }}</view></view>
+                                        <text class="nowrap">{{ rightData.addressSee.all_address }}</text>
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                    <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                        添加收货地址
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </navigator>
+                            </block>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right rightsLabel-freight">￥{{ rightData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <view class="noticeText-top">购买须知</view>
+                    <view class="noticeText-cont" v-if="notice.remark">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+                    
+                    <view class="noticeText-top">内容介绍</view>
+                    <view class="noticeText-cont" v-if="notice.content">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { buy, buySubmit } from '@/apis/interfaces/oil'
+    export default {
+        data() {
+            return {
+                rightData: {
+                    detail      : '',  // 权益内容
+                    rightId     : '',  // 权益id
+                    addressSee  : '',  // 收货地址
+                    num         : 1,   // 购买数量
+                    moreAmount  : '',  // 产品总金额
+                    freight     : '',  // 运费
+                    total       : ''   // 总金额
+                },
+                notice          : {
+                    remark      : '',     // 购买须知
+                    content     : '',     // 内容介绍
+                    noticeShow  : true   // 购买须知状态
+                },
+                buyWay          : {
+                    platformCp  : [],  // 选择提交数组
+                    platIndex   : 0,   // 选择提交方式下标
+                    isdeliver   : -1   // 选择提交方式
+                },
+                address         : {
+                    allAddress  : [],      // 收货地址列表
+                    addressShow : false    // 地址显示状态
+                },
+                disabled        : false,   //购买按钮状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.rightData.rightId = options.id
+            // this.code    = options.code || ''
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中石油活动
+            getApp().globalData.envType = 'oilEnv'
+            
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                buy({activity_petro_id: this.rightData.rightId, qty: this.rightData.num}).then(res => {
+                    let obj    = res.detail.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.def_get
+                        }
+                        if(res.detail.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.rightData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.rightData.num = num
+                    
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收银台跳转
+            payment() {
+                if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.rightData.detail.def_get
+                    
+                buySubmit({activity_petro_id: this.rightData.rightId, qty: this.rightData.num, is_deliver: this.buyWay.isdeliver}).then(res => {
+                    uni.navigateTo({
+                        url: '/pages/cashier/index?tradeNo=' + res.trade_no + '&type=oil' + "&activity_type=right" + '&price=' + this.rightData.moreAmount
+                    })
+                }).catch(err => {
+					uni.showToast({
+					    title   : err.message,
+					    icon    : 'none'
+					})
+				});
+            }
+            
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #FFFFFF;
+    }
+    
+    /* 权益内容 */
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 340rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            .classBack {
+                position: absolute;
+                left: 28%;
+                right: 30%;
+                width: 44%;
+                top: 40rpx;
+            }
+        }
+        .classCircle::after,
+        .contBack::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+        }
+        .classCircle::after {
+            left: 20%;
+            top: -20rpx;
+            width: 260rpx;
+            height: 260rpx;
+        }
+        .contBack::before {
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .welfareCont-top{
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                height: 120rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 地址
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 40rpx;
+        color: #6c6c6c;
+        font-weight: 600;
+        font-size: 30rpx;
+    }
+    
+    .rightsLabel-left {
+        flex: 1;
+        color: #747d86;
+        .rightsLabel-row {
+            width: 42rpx;
+            height: 42rpx;
+        }
+    }
+    
+    .rightsLabel-range {
+        display: flex;
+        color: #000;
+        font-weight: 600;
+    }
+    
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 30rpx;
+            width: calc(100% - 60rpx);
+            height: 2rpx;
+            background-color: #bfbfbf;
+        }
+        &::after {
+            top: 0;
+        }
+        &::before {
+            bottom: 0;
+        }
+        .rightsLabel-row {
+            margin-top: 30rpx;
+        }
+        
+        .rightsLabel-icon {
+            width: 70rpx;
+            height: 70rpx;
+            margin-top: 14rpx;
+        }
+        .rightsLabel-right {
+            width: calc(100% - 80rpx);
+            margin-left: 10rpx;
+            display: flex;
+            font-size: 28rpx;
+            .rightsLabel-address-text {
+                flex: 1;
+                color: #000000;
+                .rightsLabel-address-name {
+                    display: flex;
+                    font-size: 32rpx;
+                    margin-bottom: 10rpx;
+                    .rightsLabel-address-tel {
+                        padding-left: 30rpx;
+                        color: #959595;
+                    }
+                }
+            }
+        }
+    }
+    .rightsLabel-row {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 0 0 0 6rpx;
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        border-top: 20rpx #eeeeee solid;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/oil/details.vue b/pages/oil/details.vue
new file mode 100644
index 0000000..5a3c65a
--- /dev/null
+++ b/pages/oil/details.vue
@@ -0,0 +1,598 @@
+<template>
+    <view>
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ details.startTime }} - {{ details.endTime }}
+        		</view>
+        	</view>
+        	<view class="detailsCotent">
+        	    <view class="source">活动来源 ： {{ details.activity_name }}</view>
+        	    <view class="detailsBar">
+        	    	<view class="detailsCode-text">劵码</view>
+        	    	<image :src="barcode" mode="widthFix"></image>
+        	    </view>
+        	    <view class="detailsCode-text">
+        	    	{{ details.code }}
+        	    </view>
+        	    <view class="detailsCode">
+        	    	<image :src="qrcode" @click="refreshCode"></image>
+        	    	<view class="detailsCode-text">
+        	    		<text>请出示以上券码给网点工作人员</text>
+        	    	</view>
+        	    </view>
+                <view class="petroNew" v-if="details.right">
+                    <view class="petroNew-btn" v-if="details.right.from == 'petroNew'" @click="urlFrom">
+                        去使用
+                    </view>
+                </view>
+                
+                <!-- 门店定位 -->
+                <view class="detailsStore">
+                	<view class="detailsStore-top">
+                		<view class="detailsStore-title">
+                			适用门店
+                		</view>
+                		<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + details.id + '&type=campus'" v-if="longitude != 0 && latitude != 0">
+                			查看所有
+                			<image src="/static/icon/arrow_left.png"></image>
+                		</navigator>
+                	</view>
+                	<view class="location" v-if="longitude == 0 && latitude == 0">
+                		<image class="location-img" src="/static/img/location_img.jpg"></image>
+                		<text>您尚未授权本时生活开启定位服务</text>
+                		<text>不能看到附近的商家哦，点击下方按钮开启</text>
+                		<button class="location-btn" size="mini" open-type="openSetting">
+                			开启定位服务
+                		</button>
+                	</view>
+                	<view v-else>
+                		<block v-if="stores.length > 0">
+                			<view class="detailsStore-list" :data-id="(item.store_id)" v-for="(item, index) in stores" :key="index"
+                				@tap="detailsTap">
+                				<image :src="item.cover" class="detailsStore-logo"></image>
+                				<view class="detailsStore-cont">
+                					<view class="detailsStore-left">
+                						<view class="nowrap detailsStore-name">
+                							{{ item.title }}
+                						</view>
+                						<view class="detailsStore-place">
+                							<text class="nowrap">{{ item.address }}</text>
+                							{{ item.km }}
+                						</view>
+                					</view>
+                					<image class="detailsStore-tel" src="/static/icon/tel.png" @tap.stop="tel"
+                						:data-tel="(item.mobile)"></image>
+                				</view>
+                			</view>
+                		</block>
+                		<block v-else>
+                			<view class="pages-hint">
+                				<image src="/static/img/null_icon.png"></image>
+                				<view>暂无门店</view>
+                			</view>
+                		</block>
+                	</view>
+                </view>
+        	</view>
+            <!-- 使用须知 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		使用须知
+            	</view>
+            	<view class="detailsText-tips">
+            		<rich-text :nodes="remark"></rich-text>
+            	</view>
+            </view>
+            
+            <!-- 内容介绍 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		内容介绍
+            	</view>
+            	<view class="detailsText-tips" v-if="content != null">
+            		<rich-text :nodes="content"></rich-text>
+            	</view>
+            </view>
+        </view>
+        
+        <!-- 底部 -->
+        <view class="detailsBottom">
+            <image src="/static/img/campus_details_back.png" mode="aspectFill"></image>
+            <view class="detailsBottom-cont">
+                <view class="detailsBottom-title">
+                    中石油活动
+                </view>
+                亿时代 - 本时生活
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { qrcode, barcode, couponinfo, merchantCard, breakCode } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                id          : 0,        //优惠券id
+                longitude   : 0,        //经度
+                latitude    : 0,        //纬度
+                details     : '',       //优惠券信息
+                stores      : [],       //商家列表
+                content     : '',       //内容介绍
+                remark      : '',       //使用须知
+                qrcode      : '',       //二维码
+                barcode     : '',       //条形码
+                merchantcardinfo:''     //商家券信息
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 优惠券id
+            this.id = options.id
+    
+            // 获取二维码
+            qrcode(options.id).then(res=>{
+                this.qrcode = res.qrcode
+            })
+            
+            // 获取条形码
+            barcode(options.id).then(res=>{
+                this.barcode = res.barcode
+            })
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 获取详情信息
+            this.detailsInfo();
+            // 存储环境-中石油活动
+            getApp().globalData.envType = 'oilEnv'
+            
+            // 获取定位信息
+            uni.getLocation({
+                success: res => {
+                    this.latitude   = res.latitude
+                    this.longitude  = res.longitude
+                },
+                complete: () => {
+                    // 获取详情信息
+                    this.detailsInfo();
+                }
+            })
+        },
+        methods: {
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.id,
+                    user_lng: this.longitude,
+                    user_lat: this.latitude
+                }).then(res=>{
+                    console.log(res)
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.details = res.info
+                    this.stores  = stores
+                    this.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    //获取商家券信息
+                    if(res.info.card_type=='merchant_card'){
+                        this.getMerchantCardInfo()
+                    }
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商家券信息
+            getMerchantCardInfo(){
+                merchantCard(this.id).then(res=>{
+                   this.merchantcardinfo  = res
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 拨打电话
+            tel(e) {
+                let tel = e.currentTarget.dataset.tel
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                    url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat + '&type=campus'
+                })
+            },
+            
+            // 刷新二维码
+            refreshCode() {
+                breakCode(this.id).then(res=>{
+                    uni.showToast({
+                    	title: '刷新中',
+                    	duration: 1000,
+                        icon:'loading'
+                    });
+                   this.qrcode = res.qrcode
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            urlFrom () {
+                // #ifdef H5
+                window.location.href = "https://cloud1-0g37c0kwb91b41c8-1305411715.tcloudbaseapp.com/"
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 卡券详情 */
+    .details {
+        background: #ffffff;
+        margin: 20rpx 20rpx 0;
+        width: calc(100% - 40rpx);
+        box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+        position: relative;
+        border-radius: 0 0 20rpx 20rpx;
+        border-bottom: 240rpx solid transparent;
+        box-sizing: border-box;
+        overflow: hidden;
+    }
+    
+    .details::after,
+    .details::before {
+        position: absolute;
+        background: #e83241;
+        content: '';
+        top: -50rpx;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    
+    .details::after {
+        left: -50rpx;
+    }
+    
+    .details::before {
+        right: -50rpx;
+    }
+    
+    .detailsCotent {
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop {
+        border-bottom: 2rpx dashed #c8c8c8;
+        padding: 40rpx 0;
+        text-align: center;
+        box-sizing: border-box;
+        background-color: #f5f5f5;
+    }
+    
+    .detailsTop-name {
+        font-size: 38rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        padding: 0 60rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop-time {
+        color: #7e7e7e;
+        font-size: 26rpx;
+    }
+    
+    .detailsCode {
+        text-align: center;
+        padding: 0 0 20rpx;
+        box-sizing: border-box;
+        margin: 40rpx 0 20rpx;
+    }
+    
+    .detailsCode image {
+        width: 300rpx;
+        height: 300rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    
+    .detailsCode-text {
+        text-align: center;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #000;
+    }
+    
+    .detailsCode-text text {
+        color: #999;
+        font-weight: normal;
+        font-size: 26rpx;
+    }
+    
+    .detailsStore {
+        border-top: 2rpx #c8c8c8 solid;
+        padding-top: 40rpx;
+    }
+    
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 130rpx;
+        top: 0;
+        width: calc(100% - 130rpx);
+        display: flex;
+    }
+    
+    .detailsStore-left {
+        width: calc(100% - 90rpx);
+        margin-right: 30rpx;
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+        border-top: 2rpx solid #ececec;
+    }
+    
+    .detailsText-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText-tips {
+        font-size: 26rpx;
+        line-height: 50rpx;
+        color: #555557;
+        padding-bottom: 20rpx;
+    }
+    
+    .detailsCode-join {
+        color: #ee8e44;
+        font-size: 24rpx;
+        border-radius: 50rpx;
+        border: 2rpx solid #ee8e44;
+        padding: 10rpx 20rpx;
+        display: inline-block;
+        margin-top: 30rpx;
+    }
+    
+    .detailsCode-join.active {
+        border: 2rpx solid #999;
+        color: #999;
+    }
+    
+    .source{ 
+        margin: 30rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .location {
+        background: white;
+        width: 100%;
+        text-align: center;
+        margin: 60rpx 0 0;
+    }
+    
+    .location text {
+        font-size: 28rpx;
+        display: block;
+        line-height: 46rpx;
+        color: #999;
+    }
+    
+    .location-btn[size="mini"] {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 66rpx;
+        margin-top: 30rpx;
+    }
+    
+    .location-img {
+        width: 150rpx;
+        height: 120rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsBar {
+        text-align: center;
+        padding: 0 50rpx;
+        box-sizing: border-box;
+        margin-top: 60rpx;
+        margin-bottom: 40rpx;
+    }
+    
+    
+    .detailsBar image {
+        width: 100%;
+    }
+    
+    .detailsBar .detailsCode-text {
+        margin-bottom: 10px;
+        color: #000;
+    }
+    
+    .detailsBottom {
+        position: fixed;
+        width: 100%;
+        height: 220rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 9;
+    }
+    .detailsBottom image {
+         width: 100%;
+         height: 100%;
+         position: absolute;
+         left: 0;
+         top: 0;
+    }
+    
+    .detailsBottom-cont {
+        z-index: 10;
+        position: absolute;
+        left: 0;
+        top: 70rpx;
+        width: 100%;
+        text-align: center;
+        color: #9a9a9a;
+        font-size: 26rpx;
+    }
+    
+    .detailsBottom-title {
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        font-size: 30rpx;
+    }
+    
+    .petroNew {
+        text-align: center;
+    }
+    .petroNew-btn {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 72rpx;
+        border-radius: 6rpx;
+        margin: 0 auto 50rpx;
+        text-align: center;
+        width: 50%;
+    }
+</style>
diff --git a/pages/oil/index.vue b/pages/oil/index.vue
new file mode 100644
index 0000000..73b3bec
--- /dev/null
+++ b/pages/oil/index.vue
@@ -0,0 +1,266 @@
+<template>
+    <view>
+        <navigator v-for="(item, idx) in adverts" :key="item.cover" :url="item.url">
+            <image class="campusBanner" :src="item.cover" mode="widthFix"></image>
+        </navigator>
+        <view class="recommend"></view>
+		<view class="film" v-for="(item, index) in oilCategories" :key="index">
+			<block v-if="item.petros.length > 0">
+				<view class="filmTitle">
+					{{item.title}}
+				</view>
+				<navigator hover-class="none" :url="'/pages/oil/buy?id=' + items.activity_petro_id" class="filmList" v-for="(items, indexItem) in item.petros" :key="indexItem">
+					<view class="filmList-top">
+						<view class="filmList-top-name">
+							{{ items.three_title || '-' }}<text>{{ items.two_title || '-'}}</text>
+						</view>
+					   <view class="filmList-top-price">
+							<view v-if="items.button_text != null">
+								<view v-for="(btnItem, btnIndex) in items.button_text" :key="btnIndex">{{btnItem}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="filmList-text" v-for="(itemsDes, indexDes) in items.description" :key="indexDes">
+						<text>{{ itemsDes }}</text>
+					</view>
+					<view class="filmList-tag" v-if="items.label != null"> <view class="filmList-tag-text">{{items.label || '-'}}</view></view>
+				</navigator>
+			</block>
+		</view>
+		
+        <!-- 按钮 -->
+        <view @click="userNav('/pages/oil/myCoupon')" class="campusBtn">我的优惠券<text>立即查看</text></view>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/oil'
+    export default {
+        data() {
+            return {
+				oilCategories: '',
+                topData     : '',  // 头部推荐
+                oilMarket   : [],  // 中石油优惠券
+                oilPetro    : [],  // 超市购物券
+                adverts     : ''
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中石油新活动
+            getApp().globalData.envType = 'oilEnv'
+            
+            // 获取首页数据
+            this.indexInfo();
+        },
+        methods: {
+            // 首页数据
+            indexInfo() {
+                index().then(res=>{
+					 this.oilCategories = res.categories
+                     this.adverts       = res.adverts
+                }).catch(err=>{
+                    // if (!err.login) {
+                    //     uni.showModal({
+                    //         title: '用户登录已过期',
+                    //         content: '请重新登录',
+                    //         showCancel: false,
+                    //         success: res => {
+                    //             if (res.confirm) {
+                    //                 uni.redirectTo({
+                    //                     url: '/pages/oil/signin'
+                    //                 });
+                    //             }
+                    //         }
+                    //     });
+                    // }
+                })
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/oil/signin'
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        padding-bottom: 100rpx;
+    }
+    
+    // banner
+    .campusBanner {
+        width: 100%;
+    }
+    
+    // 推荐
+    .recommend {
+        overflow: hidden;
+        margin-top: -60rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        .recommend-label {
+            text-align: center;
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx 30rpx;
+            .recommend-label-img {
+                width: 150rpx;
+                height: 150rpx;
+                margin: 0 auto 10rpx;
+                background: linear-gradient(to bottom, #293350, #484e74);
+                box-shadow: 0px 8px 6px rgba(249,228,129,.5);
+                border-radius: 50%;
+                box-sizing: border-box;
+                image {
+                    width: 80rpx;
                    height: 80rpx;
+                    margin: 35rpx;
+                }
+            }
+            .recommend-label-text {
+                font-weight: 600;
+                text {
+                    display: block;
+                    font-size: 30rpx;
+                }
+            }
+        }
+    }
+    
+    // 列表
+    .film {
+        width: 100%;
+        padding: 10rpx 30rpx;
+        box-sizing: border-box;
+    }
+    .filmTitle {
+        background: linear-gradient(to right, #feefce, #fbe9c0, #e8d19b);
+        line-height: 80rpx;
+        box-shadow: -4px 0 10px rgba(134,97,33,.2);
+        text-align: center;
+        border-radius: 10rpx 10rpx 0 0;
+        color: #a47d53;
+        font-weight: 600;
+        margin: 0 20rpx;
+    }
+    .filmList {
+        position: relative;
+        background: linear-gradient(to right, #494e75, #27314d);
+        box-shadow: 0px 6px 10px rgba(134,97,33,.5);
+        border-radius: 10rpx;
+        padding: 50rpx 30rpx 30rpx;
+        box-sizing: border-box;
+        margin-bottom: 20rpx;
+        overflow: hidden;
+        &:last-child {
+            margin-bottom: 0;
+        }
+        .filmList-tag {
+            transform: rotate(45deg);
+            position: absolute;
+            padding: 10px 0;
+            right: -33px;
+            top: -10px;
+            width: 150px;
+            background: red;
+            .filmList-tag-text {
+                position: absolute;
+                color: #FFFFFF;
+                right: 20px;
+                text-align: center;
+                top: 2px;
+                font-size: 12px;;
+                transform:rotate(-360deg);
+            }
+        }
+        .filmList-top {
+            display: flex;
+            margin-bottom: 10rpx;
+            .filmList-top-name {
+                width: calc(100% - 160rpx);
+                margin-right: 20rpx;
+                color: #fce2ae;
+                font-size: 34rpx;
+				font-weight: bold;
+                text {
+                    display: block;
+                    font-size: 25rpx;
+                    margin-top: 10rpx;
+					font-weight: normal;
+                }
+            }
+            .filmList-top-price {
+				position: relative;
+                background: linear-gradient(to right, #d3ad68, #cda65f);
+                box-shadow: 0px 2px 10px rgba(249,228,129,.5);
+                width: 120rpx;
+                height: 120rpx;
+                border-radius: 50%;
+                color: #FFFFFF;
+                text-align: center;
+                padding-top: 20rpx;
+                font-size: 30rpx;
+                box-sizing: border-box;
+                text {
+                    display: block;
+                    text-shadow: 0px 6px 10px rgba(134,97,33,.5);
+                }
+				.filmList-tag{
+					position: absolute;
+					background: #ff0000;
+					color: white;
+					font-size: 20rpx;
+					top: -10%;
+					left: 20%;
+					width: 120rpx;
+					padding: 0 10rpx;
+					line-height: 40rpx;
+					border-radius: 15rpx;
+					transform: scale(0.58)
+				}
+            }
+        }
+        .filmList-text {
+            font-size: 20rpx;
+            color: #c1c1c1;
+			// margin-left: -70rpx;
+            text {
+                display: block;
+				// transform: scale(0.8)
+            }
+        }
+    }
+    
+    // 按钮
+    .campusBtn {
+        background: linear-gradient(to right, #474d73, #28314e);
+        box-shadow: 0px 6px 10px rgba(188,152,90,.5);
+        border-radius: 60rpx;
+        line-height: 90rpx;
+        height: 90rpx;
+        margin: 30rpx 60rpx 0;
+        text-align: center;
+        color: #FFFFFF;
+        text {
+            color: #bd9045;
+            padding-left: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/oil/myCoupon.vue b/pages/oil/myCoupon.vue
new file mode 100644
index 0000000..9b5de53
--- /dev/null
+++ b/pages/oil/myCoupon.vue
@@ -0,0 +1,653 @@
+<template>
+    <view>
+        <image class="campusCoupon" src="/static/img/oilCoupon_img.png" mode="widthFix"></image>
+        <view class="user">
+           <image src="/static/img/campusCoupon_user.png" mode=""></image> 尊敬的<text>{{ userTel }}</text>, 欢迎参加联通优惠活动
+        </view>
+        <!-- 我的卡券 -->
+        <view class="borderContent">
+            <view class="campusCont">
+                <!-- 卡券tab -->
+                <view class="couponTab">
+                    <view class="couponTab-label" :class="{active : stateType == item.used}" @tap="orderTab" v-for="(item, index) in couponLabel" :key="index" :data-index="(index)" :data-state="(item.used)">
+                        {{ item.title }}
+                        <view v-if="item.used == 0">({{count.init}}张)</view>
+                        <view v-else-if="item.used == 1">({{count.used}}张)</view>
+                        <view v-else>({{ count.pass }}张)</view>
+                    </view>
+                </view>
+                
+                <!-- 卡券列表 -->
+                <view class="coupon" v-if="coupons.length > 0" :class="{active : coupons.length < 1}">
+                    <view class="couponCont" :class="{active : item.status != 0}" v-for="(item, index) in coupons" :key="index">
+                        <view hover-class="none" class="couponList" @tap="couponUrl" :data-id="(item.coupon_id)">
+                            <view class="couponList-left">
+                                <image class="couponList-img" src="/static/img/coupon_coupon_img.png"></image>
+                                <!-- 优惠券 -->
+                                <view class="couponList-icon" v-if="item.type == 'physical'">
+                                    <image src="/static/img/coupon_icon_01.png"></image>
+                                </view>
+                
+                                <!-- 实物 -->
+                                <view class="couponList-icon" v-else>
+                                    <image src="/static/img/coupon_icon_00.png"></image>
+                                </view>
+                            </view>
+                            <view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+                                <view class="nowrap couponList-title">{{ item.name }}</view>
+                                <view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{item.activity_name}}</view>
+                                <view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+                                <view class="couponList-used" v-if="item.used_at != ''">使用时间：{{item.used_at}}</view>
+                            </view>
+                            <block v-if="item.status == 0">
+                                <view class="couponList-right">
+                                    去使用
+                                </view>
+                            </block>
+                            <image v-if="item.status == 1" src="/static/img/coupon_tips_00.png" class="coupoTips"></image>
+                            <image v-if="item.status == 2" src="/static/img/coupon_tips_01.png" class="coupoTips"></image>
+                        </view>
+                        <view class="couponMore" v-if="item.count > 1" >
+                            <view class="couponMore-text" @tap="couponTap" :data-id="(item.activityId)" :data-status="(item.status)">
+                                <view class="couponMore-title">查看全部{{ item.count }}张卡券</view>
+                                <image class="couponMore-arrow" src="/static/icon/arrow_left.png"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                
+                <!-- 优惠券为空 -->
+                <view class="campus_tips" v-else>
+                    <image src="/static/img/coupon_tips.png"></image>
+                    <view>暂无优惠券</view>
+                </view>
+            </view>
+        </view>
+        <!-- 底部快捷导航 -->
+        <view class="navFooter">
+            <navigator hover-class="none" url="/pages/oil/index" class="navFooter-label">
+                <image src="/static/icon/navFooter_icon_00.png" mode=""></image>
+                活动中心
+            </navigator>
+            <view class="navFooter-label active">
+                <image src="/static/icon/navFooter_icon_01_active.png" mode=""></image>
+                我的优惠券
+            </view>
+        </view>
+        
+        <!-- 漂浮窗 -->
+        <view class="indexFloat" @click="followBtn">
+        	<image src="/static/img/subscribe.jpg" mode="aspectFill" class="indexFloat-animation"></image>
+            <view class="indexFloat-text">
+                <!-- <text>可查看大图</text> -->
+                <text>关注小程序</text>
+            </view>
+        </view>
+        
+        <!-- 关注公众号弹出 -->
+        <view class="followBack" :class="{active : followState}"></view>
+        <view class="followPop" :class="{active : followState}">
+            <image class="followPop-img" src="/static/img/subscribe.jpg" mode="widthFix"></image>
+            <view class="followPop-text">
+                <text>长按识别图中二维码</text>
+                <image src="/static/img/follow_tips.png" mode="aspectFill"></image>
+            </view>
+            <view class="followPop-tips">
+                本时生活平台优惠活动
+            </view>
+        </view>
+        <image class="followPop-clos" :class="{active : followState}" src="/static/icon/add.png" mode="aspectFill" @click="followBtn"></image>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/user'
+    import { coupon } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                userTel     : '',   //用户者手机号
+                coupons     : [],   //优惠券列表
+                count       : '',   //优惠券-张数
+                //优惠券Tab列表
+                couponLabel : [
+                    { title : "未使用", used: 0 },
+                    { title : "已使用", used: 1 },
+                    { title : "已过期", used: 2 }
+                ],
+                stateType   : '0', //卡券状态
+                type        : '',  //卡券来源
+                followState : false //二维码弹出状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 获取用户信息
+            index().then(res => {
+                this.userTel = res.info.username
+            }).catch(err => {
+                if (!err.login) {
+                    uni.showModal({
+                        title: '用户登录已过期',
+                        content: '请重新登录',
+                        showCancel: false,
+                        success: res => {
+                            if (res.confirm) {
+                                uni.redirectTo({
+                                    url: '/pages/oil/signin'
+                                });
+                            }
+                        }
+                    });
+                }
+            });
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中石油活动
+            getApp().globalData.envType = 'oilEnv'
+            
+            // 获取列表
+            this.couponInfo();
+        },
+        methods: {
+            // 卡券列表
+            couponInfo() {
+                coupon({
+                    status: this.stateType,
+                    type: 'school'
+                }).then(res=>{
+                    this.count   = res.count
+                    this.coupons = res.list
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    wx.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // tabs 选项卡
+            orderTab(e){
+                if(this.stateType != e.currentTarget.dataset.state){
+                    this.stateType = e.currentTarget.dataset.state
+                    // 获取卡权益
+                    this.couponInfo()
+                }
+            },
+            
+            // 查看优惠券分组
+            couponTap(e) {
+                let id      = e.currentTarget.dataset.id,
+                    status  = e.currentTarget.dataset.status
+                uni.navigateTo({
+                    url: '/pages/oil/myList?id=' + id + '&status=' + status
+                })
+            },
+            
+            // 优惠券跳转详情
+            couponUrl(e) {
+                let newId     = e.currentTarget.dataset.id
+                uni.navigateTo({
+                    url: '/pages/oil/details?id=' + newId
+                })
+            },
+            
+            // 公众号展示
+            followBtn() {
+                this.followState = !this.followState
+            }
+        }
+    }
+</script>
+
+<style>
+    .campusCoupon {
+        width: 100vw;
+    }
+    
+    page {
+        background-color: #c32631;
+    }
+    
+    /* 用户信息 */
+    .user {
+        width: 100%;
+        background: linear-gradient(to right, #f9ecb7, #eed276);
+        font-size: 28rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        color: #da2025;
+        display: flex;
+        line-height: 48rpx;
+    }
+    
+    .user text {
+        font-weight: 600;
+        padding: 0 10rpx;
+    }
+    
+    .user image {
+        width: 48rpx;
+        height: 48rpx;
+        margin-right: 10rpx;
+    }
+    
+    /* 优惠券 */
+    .borderContent {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .campusCont {
+        background-color: #e83241;
+        margin: 30rpx 20rpx;
+        border-radius: 20rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .campusCont.active {
+        border-bottom: 140rpx solid transparent;
+    }
+    
+    .couponTab{
+        background-color: #d32838;
+        color: #ffffff;
+        display: flex;
+        padding: 20rpx 40rpx 0;
+        box-sizing: border-box;
+        border-radius: 20rpx 20rpx 0 0;
+    }
+    
+    .couponTab-label {
+        flex: 3;
+        text-align: center;
+        position: relative;
+        padding: 10rpx 20rpx;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        border-radius: 20rpx 20rpx 0 0;
+    }
+    
+    .couponTab-label.active {
+        background-color: #fdf4ed;
+        color: #b9505f;
+    }
+    
+    .couponTab-label view {
+        font-size: 24rpx;
+        margin-top: 6rpx;
+    }
+    
+    .coupon {
+        padding-bottom: 10rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponCont {
+        margin: 0 0 30rpx;
+        width: 100%;
+        border-radius: 10rpx;
+        overflow: hidden;
+    }
+    
+    .couponCont:last-child {
+        margin-bottom: 0;
+    }
+    
+    .couponList {
+        background: #fdf4ed;
+        width: 100%;
+        height: 160rpx;
+        position: relative;
+    }
+    
+    .couponList-left {
+        position: relative;
+        left: 0;
+        top: 0;
+        width: 160rpx;
+        height: 160rpx;
+    }
+    
+    .couponList-img {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+    
+    .couponList-icon {
+        position: absolute;
+        left: calc(50% - 56rpx);
+        top: calc(50% - 50rpx);
+        z-index: 2;
+        width: 100rpx;
+        height: 100rpx;
+        background: #fff;
+        border-radius: 50%;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponList-icon image {
+        width: 100%;
+        height: 100%;
+    }
+    
+    .couponList-center {
+        position: absolute;
+        left: 180rpx;
+        top: 35rpx;
+        width: calc(100% - 330rpx);
+    }
+    
+    .couponList-center.active {
+        top: 15rpx;
+    }
+    
+    .couponList-title {
+        margin-bottom: 10rpx;
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #743e3e;
+    }
+    
+    .couponList-time,
+    .couponList-used {
+        font-size: 24rpx;
+        color: grey;
+    }
+    
+    .couponList-used {
+        margin-bottom: 14rpx;
+        color: #855757;
+    }
+    
+    .couponList-right {
+        background: transparent;
+        border: 2rpx solid #fc9f36;
+        color: #f39124;
+        border-radius: 30rpx;
+        width: 110rpx;
+        text-align: center;
+        height: 50rpx;
+        line-height: 50rpx;
+        position: absolute;
+        right: 20rpx;
+        top: 55rpx;
+        font-size: 24rpx;
+    }
+    
+    .couponList-right.active {
+        background: #dddddd;
+    }
+    
+    .couponMore {
+        font-size: 28rpx;
+        color: #686868;
+        position: relative;
+        height: 120rpx;
+    }
+    
+    .couponMore::after,
+    .couponMore::before {
+        position: absolute;
+        content: '';
+        height: 20rpx;
+        border-radius: 10rpx;
+        background: #fff;
+        box-shadow: 0 0 20rpx rgba(0, 0, 0, .1);
+        z-index: 1;
+        height: 30rpx;
+    }
+    
+    .couponMore::after {
+        width: calc(100% - 40rpx);
+        top: 70rpx;
+        left: 20rpx;
+    }
+    
+    .couponMore::before {
+        width: calc(100% - 80rpx);
+        top: 90rpx;
+        left: 40rpx;
+    }
+    
+    .couponMore-text {
+        display: flex;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 99;
+        height: 80rpx;
+        border-radius: 0 0 10rpx 10rpx;
+        line-height: 80rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        background: #fff;
+        box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    }
+    
+    .couponMore-title {
+        flex: 1;
+    }
+    
+    .couponMore-arrow {
+        width: 28rpx;
+        height: 28rpx;
+        margin-top: 26rpx;
+    }
+    
+    .couponCont.active .couponList-img,
+    .couponCont.active .couponList-icon {
+        -webkit-filter: grayscale(100%);
+        -moz-filter: grayscale(100%);
+        -ms-filter: grayscale(100%);
+        -o-filter: grayscale(100%);
+        filter: grayscale(100%);
+        filter: gray;
+    }
+    
+    .coupoTips {
+        position: absolute;
+        top: 22rpx;
+        right: 20rpx;
+        z-index: 99;
+        width: 120rpx;
+        height: 120rpx;
+    }
+    
+    .campus_tips {
+        text-align: center;
+        width: 100%;
+        background-color: #ffffff;
+        border-radius: 0 0 20rpx 20rpx;
+        padding: 80rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .campus_tips image {
+        width: 160rpx;
+        height: 160rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    /* 底部快捷导航 */
+    .navFooter {
+        position: fixed;
+        width: 100%;
+        height: 110rpx;
+        background-color: #FFFFFF;
+        z-index: 1000;
+        left: 0;
+        bottom: 0;
+        font-size: 26rpx;
+        display: flex;
+    }
+    
+    .navFooter-label {
+        flex: 2;
+        text-align: center;
+        width: 50%;
+        color: #a2a2a2;
+    }
+    
+    .navFooter-label.active {
+        color: #c32631;
+    }
+    
+    .navFooter-label image {
+        width: 54rpx;
+        height: 54rpx;
+        display: block;
+        margin: 8rpx auto 0;
+    }
+    
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        right: 20rpx;
+        bottom: 180rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-text {
+        height: 40rpx;
+        overflow: hidden;
+        color: #000000;
+    }
+    
+    .indexFloat-text text {
+        line-height: 40rpx;
+        display: block;
+        font-size: 24rpx;
+    }
+    
+    .indexFloat-animation {
+        width: 130rpx;
+        height: 130rpx;
+        animation: shake 3s linear infinite;
+    }
+    
+    @keyframes shake {
+        70%, 80% {
+          transform: rotate(7deg);
+        }
+        75% {
+          transform: rotate(-7deg);
+        }
+       
+        65%,
+        85% {
+          transform: rotate(0);
+        }
+    }
+    
+    /* 关注公众号弹出 */
+    .followBack {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        background: rgba(0,0,0,.7);
+        left: 0;
+        top: 0;
+        z-index: 1000;
+        display: none;
+    }
+    
+    .followBack.active {
+        display: block;
+    }
+    
+    .followPop {
+        position: fixed;
+        z-index: 1001;
+        height: 760rpx;
+        left: 15%;
+        right: 15%;
+        top: 300rpx;
+        background-color: #ffffff;
+        border-radius: 20rpx;
+        text-align: center;
+        overflow: hidden;
+        display: none;
+    }
+    
+    .followPop.active {
+        display: block;
+    }
+    
+    .followPop-img {
+        width: 70%;
+        margin: 60rpx 0 50rpx;
+    }
+    
+    .followPop-text {
+        color: #7d7d7d;
+        font-size: 32rpx;
+        position: relative;
+    }
+    
+    .followPop-text::after,
+    .followPop-text::before {
+        position: absolute;
+        content: '';
+        top: 25rpx;
+        width: 60rpx;
+        height: 2rpx;
+        background-color: #cfcfcf;
+    }
+    
+    .followPop-text::after {
+        left: 30rpx;
+    }
+    
+    .followPop-text::before {
+        right: 30rpx;
+    }
+    
+    .followPop-text image {
+        width: 120rpx;
+        height: 120rpx;
+        margin: 10rpx auto 20rpx;
+        display: block;
+    }
+    
+    .followPop-tips {
+        background-color: #e1e5ec;
+        line-height: 90rpx;
+        color: #7f8487;
+    }
+    
+    .followPop-clos {
+        position: fixed;
+        top: 1100rpx;
+        left: calc(50% - 25rpx);
+        width: 50rpx;
+        height: 50rpx;
+        z-index: 1001;
+        display: none;
+        transform: rotate(45deg);
+    }
+    
+    .followPop-clos.active {
+        display: block;
+    }
+</style>
diff --git a/pages/oil/myList.vue b/pages/oil/myList.vue
new file mode 100644
index 0000000..c0eddb4
--- /dev/null
+++ b/pages/oil/myList.vue
@@ -0,0 +1,315 @@
+<template>
+    <view>
+        <!-- 我的卡券列表 -->
+        <view class="coupon" v-if="couponArr.length > 0">
+        	<view class="couponCont" :class="{active : item.status != 0}" v-for="(item, index) in couponArr" :key="index">
+        		<view hover-class="none" class="couponList" @tap="couponUrl" :data-id="(item.id)">
+        			<view class="couponList-left">
+        				<image class="couponList-img" src="/static/img/coupon_coupon_img.png"></image>
+        				<!-- 优惠券 -->
+        				<view class="couponList-icon" v-if="item.type == 'physical'">
+        					<image src="/static/img/coupon_icon_01.png"></image>
+        				</view>
+        
+        				<!-- 实物 -->
+        				<view class="couponList-icon" v-else>
+        					<image src="/static/img/coupon_icon_00.png"></image>
+        				</view>
+        			</view>
+        			<view class="couponList-center" :class="{active : item.used_at != '' || item.status == 0}">
+        				<view class="nowrap couponList-title">{{ item.name }}</view>
+                        <view class="nowrap couponList-used" v-if="item.status == 0">活动来源： {{item.activity_name}}</view>
+        				<view class="couponList-time">{{ item.startTime }} 至 {{ item.endTime }}</view>
+        				<view class="couponList-used" v-if="item.used_at != ''">使用时间：{{item.used_at}}</view>
+        			</view>
+        			<block v-if="item.status == 0">
+        				<view class="couponList-right">
+        					去使用
+        				</view>
+        			</block>
+        			<image v-if="item.status == 1" src="/static/img/coupon_tips_00.png" class="coupoTips"></image>
+        			<image v-if="item.status == 2" src="/static/img/coupon_tips_01.png" class="coupoTips"></image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 优惠券为空 -->
+        <view class="pack-center pages-hint" v-else>
+        	<image src="/static/img/coupon_tips.png"></image>
+        	<view>暂无优惠券</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { couponArr } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                couponArr   : '',    //卡券组列表
+                id          : '',    //优惠券携带id
+                status      : '',    //优惠券携带状态
+                page        : 1,     //分页
+                lodingStats : false  //加载状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.id      = options.id
+            this.status  = options.status
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中石油活动
+            getApp().globalData.envType = 'oilEnv'
+            
+            // 获取卡券组列表
+            this.couponInfo();
+        },
+        
+        methods: {
+            // 卡券列表
+            couponInfo(page) {
+                couponArr({
+                    activityId: this.id,
+                    status: this.status,
+                    page: page || ''
+                }).then(res=>{
+                    let listArr = this.couponArr,
+                        newData = []
+                    if(page == 1 || page == undefined) listArr = []
+        
+                    newData = listArr.concat(res.data)
+                    this.couponArr   = newData
+                    this.page        = res.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/oil/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 优惠券跳转
+            couponUrl(e) {
+                let newId     = e.currentTarget.dataset.id
+                uni.navigateTo({
+                    url: '/pages/oil/details?id=' + newId
+                })
+            },
+            
+            // 页面相关事件处理函数--监听用户下拉动作
+            onPullDownRefresh() {
+                // 获取团购列表
+                this.couponInfo();
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.couponInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+    }
+    
+    .coupon {
+        margin-top: 30rpx;
+    }
+    
+    .couponCont {
+        margin: 20rpx;
+        width: calc(100% - 40rpx);
+        border-radius: 10rpx;
+        overflow: hidden;
+    }
+    
+    .couponList {
+        background: #fdf4ed;
+        width: 100%;
+        height: 160rpx;
+        position: relative;
+    }
+    
+    .couponList-left {
+        position: relative;
+        left: 0;
+        top: 0;
+        width: 160rpx;
+        height: 160rpx;
+    }
+    
+    .couponList-img {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+    
+    .couponList-icon {
+        position: absolute;
+        left: calc(50% - 56rpx);
+        top: calc(50% - 50rpx);
+        z-index: 2;
+        width: 100rpx;
+        height: 100rpx;
+        background: #fff;
+        border-radius: 50%;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .couponList-icon image {
+        width: 100%;
+        height: 100%;
+    }
+    
+    .couponList-center {
+        position: absolute;
+        left: 180rpx;
+        top: 35rpx;
+        width: calc(100% - 330rpx);
+    }
+    
+    .couponList-center.active {
+        top: 15rpx;
+    }
+    
+    .couponList-title {
+        margin-bottom: 10rpx;
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #743e3e;
+    }
+    
+    .couponList-time,
+    .couponList-used {
+        font-size: 24rpx;
+        color: grey;
+    }
+    
+    .couponList-used {
+        margin-bottom: 14rpx;
+        color: #855757;
+    }
+    
+    .couponList-right {
+        background: transparent;
+        border: 2rpx solid #fc9f36;
+        color: #f39124;
+        border-radius: 30rpx;
+        width: 110rpx;
+        text-align: center;
+        height: 50rpx;
+        line-height: 50rpx;
+        position: absolute;
+        right: 20rpx;
+        top: 55rpx;
+        font-size: 24rpx;
+    }
+    
+    .couponList-right.active {
+        background: #dddddd;
+    }
+    
+    .couponMore {
+        font-size: 28rpx;
+        color: #686868;
+        position: relative;
+        height: 120rpx;
+    }
+    
+    .couponMore::after,
+    .couponMore::before {
+        position: absolute;
+        content: '';
+        height: 20rpx;
+        border-radius: 10rpx;
+        background: #fff;
+        box-shadow: 0 0 20rpx rgba(0, 0, 0, .1);
+        z-index: 1;
+        height: 30rpx;
+    }
+    
+    .couponMore::after {
+        width: calc(100% - 40rpx);
+        top: 70rpx;
+        left: 20rpx;
+    }
+    
+    .couponMore::before {
+        width: calc(100% - 80rpx);
+        top: 90rpx;
+        left: 40rpx;
+    }
+    
+    .couponMore-text {
+        display: flex;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        z-index: 99;
+        height: 80rpx;
+        border-radius: 0 0 10rpx 10rpx;
+        line-height: 80rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        background: #fff;
+        box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    }
+    
+    .couponMore-title {
+        flex: 1;
+    }
+    
+    .couponMore-arrow {
+        width: 28rpx;
+        height: 28rpx;
+        margin-top: 26rpx;
+    }
+    
+    .couponCont.active .couponList-img,
+    .couponCont.active .couponList-icon {
+        -webkit-filter: grayscale(100%);
+        -moz-filter: grayscale(100%);
+        -ms-filter: grayscale(100%);
+        -o-filter: grayscale(100%);
+        filter: grayscale(100%);
+        filter: gray;
+    }
+    
+    .coupoTips {
+        position: absolute;
+        top: 22rpx;
+        right: 20rpx;
+        z-index: 99;
+        width: 120rpx;
+        height: 120rpx;
+    }
+</style>
diff --git a/pages/oil/password.vue b/pages/oil/password.vue
new file mode 100644
index 0000000..c2cba24
--- /dev/null
+++ b/pages/oil/password.vue
@@ -0,0 +1,231 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">身份验证</view>
+			</view>
+			<image class="cover" src="/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<button class="campus-form-btn" form-type="submit">设置新密码</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+		
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || ''
+					
+				auth({
+					mobile: mobileNo,
+					code: code,
+					type: 'reset_password'
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.redirectTo({
+						url: '/pages/oil/setPassword'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/oil/register.vue b/pages/oil/register.vue
new file mode 100644
index 0000000..fe1c7df
--- /dev/null
+++ b/pages/oil/register.vue
@@ -0,0 +1,238 @@
+<template>
+	<view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">用户注册</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+	    <view class="campus-cont">
+	        <form @submit="submitRegister">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue"
+				        name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请输入密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请确认密码" name="password_confirmation"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">注册</button>
+	        </form>
+	    </view>
+	</view>
+</template>
+
+<script>
+    import { send, register } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{
+						uni.showToast({
+						    title   : err.message,
+							icon	:'none',
+						    duration: 2000
+						})
+					})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            submitRegister(e){
+				let formValue = e.detail.value
+				
+				register({
+					mobile					: formValue.mobile,
+					password				: formValue.password,
+					password_confirmation	: formValue.password_confirmation,
+					code					: this.code,
+					parent_id				: 0
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.showModal({
+						title		: "提示",
+						content		: "注册成功",
+						showCancel	: false,
+						confirmText : "确定",
+						success		: modalRes => {
+							if(modalRes.confirm){
+								uni.reLaunch({
+								    url: '/pages/oil/index'
+								})
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/oil/setPassword.vue b/pages/oil/setPassword.vue
new file mode 100644
index 0000000..60b652c
--- /dev/null
+++ b/pages/oil/setPassword.vue
@@ -0,0 +1,169 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">设置新密码</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="设置新的登录密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="确认新的登录密码" name="newpassword"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">找回</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { passSetup } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+            }
+        },
+        methods: {
+            // 立即登录
+            forgetlogin(e){
+                let newPass  = e.detail.value.newpassword || '',
+					password = e.detail.value.password || ''
+				
+				passSetup({
+					password: password,
+					password_confirmation: newPass
+				}).then(res => {
+					uni.showToast({
+						title: "密码重置成功",
+						icon : 'none'
+					})
+					uni.reLaunch({
+					    url: '/pages/oil/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/oil/signin.vue b/pages/oil/signin.vue
new file mode 100644
index 0000000..0e2457f
--- /dev/null
+++ b/pages/oil/signin.vue
@@ -0,0 +1,260 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">联通优惠活动登录</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/campus_login_02.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code" v-if="!passwordLogin">
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs" v-else>
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="password" placeholder="请输入登录密码" name="password"></input>
+				</view>
+				<view class="resPassword">
+					<navigator url="password">忘记密码</navigator>
+				</view>
+				<button class="campus-form-btn" form-type="submit">登录</button>
+            </form>
+			<view class="login-box">
+				<view @click="onCutLogin">{{passwordLogin ? '验证码登录': '密码登录'}}</view>
+				<navigator url="register">快速注册</navigator>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth, passlogin } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+				passwordLogin: true, // 登录方式
+                disabled     : false,
+            }
+        },
+        
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                console.log('sss')
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]|16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || '',
+					password = e.detail.value.password || '',
+					loginFunction
+				
+				if(this.passwordLogin){
+					loginFunction = passlogin({
+						mobile	: mobileNo,
+						password: password
+					})
+				}else{
+					loginFunction = auth({
+						mobile: mobileNo,
+						code: code,
+						type: ''
+					})
+				}
+				
+				loginFunction.then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/oil/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 90rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+			navigator{
+				display: inline-block;
+			}
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/order/order.vue b/pages/order/order.vue
new file mode 100644
index 0000000..bd9aa86
--- /dev/null
+++ b/pages/order/order.vue
@@ -0,0 +1,364 @@
+<template>
+    <view>
+        <!-- 活动订单 -->
+        <view class="order-tab">
+        	<view class="order-tab-item" :class="{active : order.stateType == 'all'}" @click="orderTab('all')">
+        		全部
+        	</view>
+        	<view class="order-tab-item" :class="{active : order.stateType == 'unpay'}" @click="orderTab('unpay')">
+        		待支付
+        	</view>
+        	<view class="order-tab-item" :class="{active : order.stateType == 'paid'}" @click="orderTab('paid')">
+        		{{order.orderType == 'welfare' || order.orderType == 'rights' ? '待发货' : '已支付'}}
+        	</view>
+        	<view class="order-tab-item" :class="{active : order.stateType == 'delivered'}" @click="orderTab('delivered')" v-if="order.orderType == 'welfare' || order.orderType == 'rights'">
+        		已发货
+        	</view>
+        	<view class="order-tab-item" :class="{active : order.stateType == 'completed'}" @click="orderTab('completed')" v-else>
+        		已完成
+        	</view>
+        </view>
+        
+        <!-- 列表 -->
+        <view class="order-content" v-if="order.orderArr.length > 0">
+        	<view class="order-content-li" v-for="(item,index) in order.orderArr" :key="index">
+        		<view class="uni-border-down order-store">
+        			<view class="order-store-title nowrap">{{ item.orderid }}</view>
+        			<view class="order-store-stateText red" v-if="item.state_text == '未支付' || item.status_text == '未支付'">
+        				{{ item.state_text ||item.status_text }}
+        			</view>
+        			<view class="order-store-stateText green" v-else-if="item.state_text == '已支付' || item.status_text == '已支付'">
+        				{{ item.state_text || item.status_text }}
+        			</view>
+        			<view class="order-store-stateText" v-else>{{ item.state_text || item.status_text }}</view>
+        		</view>
+        		<view class="order-goods">
+                    <image class="order-goods-cover" v-if="item.items" :src="item.items.cover" mode="aspectFill"></image>
+                    <image class="order-goods-cover" v-else-if="item.source" :src="item.source.right.cover" mode="aspectFill"></image>
+        			<view class="order-goods-content">
+                        <!-- 名称 -->
+        				<view class="order-goods-content-name nowrap" v-if="item.items">{{ item.items.title }}</view>
+                        <view class="order-goods-content-name nowrap" v-else-if="item.source">{{ item.source.right.title }}</view>
+                        
+                        <!-- 权益标签 实物或券 -->
+        				<view class="orderVirtual" v-if="order.orderType == 'welfare'">{{ item.type_text }}</view>
+                        <view class="orderVirtual" v-else-if="order.orderType == 'welfareGoods'">{{ item.type_text }}</view>
+        				<view class="orderVirtual" :class="{active : item.items.type != 'virtual'}" v-else>
+        					<block v-if="item.items.type == 'virtual'">红包电子券</block>
+        					<block v-else>实物券</block>
+        				</view>
+                        
+                        <!-- 权益购买数量 -->
+        				<view class="order-goods-content-price nowrap" v-if="item.items">
+        					<text>￥{{ item.items.price }}</text> × {{ item.items.qty ? item.items.qty : '1' }}
+        				</view>
+                        <view class="order-goods-content-price nowrap" v-else-if="item.source">
+                        	<text>￥{{ item.source.welfare.price }}</text>× 1
+                        </view>
+        			</view>
+        		</view>
+        		<view class="uni-border-top order-btns">
+        			<navigator class="order-btn" :url="'/pages/order/orderData?id=' + item.orderid + '&orderType=' + order.orderType">订单详情</navigator>
+                    <!-- 取消订单 -->
+                    <view class="order-btn" @click="orderDelete(item.orderid)" v-if="item.canCancel == true">取消订单</view>
+                    <block v-if="item.can">
+                        <view class="order-btn" @click="orderDelete(item.orderid)" v-if="item.can.cancel == true">取消订单</view>
+                    </block>
+                    <!-- 立即支付 -->
+                    <view class="order-btn order-btn-back" @click="submitPay(item.orderid)" v-if="item.canPay == true">立即支付</view>
+                    <block v-if="item.can">
+                        <view class="order-btn order-btn-back" @click="submitPay(item.orderid)" v-if="item.can.pay == true">立即支付</view>
+                    </block>
+        		</view>
+        	</view>
+        </view>
+        
+        <view class="pack-center pages-hint" v-else>
+        	<image src="/static/img/null_icon.png"></image>
+        	<view>暂无订单</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { welfare, welfareCoupons, orders, ordersCoupons, cancel, welfaresCancel } from '@/apis/interfaces/user'
+    import { rightsSingle } from '@/apis/interfaces/rights'
+    import { welfSingle } from '@/apis/interfaces/welfares'
+    export default {
+    	data() {
+    		return {
+                order: {
+                    orderType   : '',    // 订单来源
+                    stateType   : 'all', // 状态
+                    orderArr    : []     // 列表
+                },
+                load:       {
+                    page    : 1,        // 第一页
+                    allpage : 0,        // 总页数
+                    has_more: false,    // 是否有分页
+                    show    : false     // 是否有下一页数据
+                },
+                finished    : false,    // 商品列表没有更多商品是否显示
+                LoadData    : false     // 数据加载完渲染
+            }
+        },
+        onLoad(options) {
+            this.order.orderType = options.orderType
+        },
+        onShow() {
+            // 获取商品活动订单
+            this.orderInfo();
+        },
+        methods:{
+            // 商品活动订单
+            orderInfo() {
+                if (this.load.page == 1) {
+                    this.order.orderArr = [];
+                }
+                let url = ''
+                if(this.order.orderType == 'welfare') url = welfare
+                if(this.order.orderType == 'welfareGoods') url = welfareCoupons
+                if(this.order.orderType == 'rights') url = orders
+                if(this.order.orderType == 'rightsCoupons') url = ordersCoupons
+                url({
+                    type    : this.order.stateType,
+                    page    : this.load.page
+                }).then(res=>{
+                    this.order.orderArr = this.order.orderArr.concat(res.data)
+                    this.load.allpage   = res.page.total_page
+                    this.load.has_more  = res.page.has_more
+                })
+            },
+            
+            // tabs
+            orderTab(state){
+                if(this.order.stateType != state){
+                    this.order.stateType = state
+                    // 获取商品活动订单
+                    this.orderInfo()
+                }
+            },
+            
+            // 取消订单
+            orderDelete(orderId) {
+                uni.showModal({
+                    title   : '订单取消',
+                    content : '确认取消吗？',
+                    success : res=> {
+                        if (res.confirm) {
+                            let url = ''
+                            if(this.order.orderType == 'welfare' || this.order.orderType == 'welfareGoods') url = welfaresCancel
+                            if(this.order.orderType == 'rights' || this.order.orderType == 'rightsCoupons') url = cancel
+                            url(orderId).then(res=>{
+                                // 获取商品活动订单
+                                this.orderInfo()
+                            }) 
+                        } else if (res.cancel) {
+                            uni.showToast({
+                                title   : '取消',
+                                icon    : 'loading',
+                                duration: 1000
+                            })
+                        }
+                    }
+                }) 
+            },
+            
+            // 支付选择弹出
+            submitPay(orderid) {
+                let new_activity_type = '',
+                    new_deliver = ''
+                // welfareGoods  welfare
+                if(this.order.orderType == 'welfare') {
+                    new_activity_type = 'welfare'
+                    new_deliver = 0
+                    this.welfSingleData(orderid).then(res => {
+                        this.navigateUrl(res.trade_no,res.amount,new_deliver,new_activity_type)
+                    })
+                }
+                else if(this.order.orderType == 'welfareGoods') {
+                    new_activity_type = 'welfare'
+                    new_deliver = 1
+                    this.welfSingleData(orderid).then(res => {
+                        this.navigateUrl(res.trade_no,res.amount,new_deliver,new_activity_type)
+                    })
+                }
+                else if(this.order.orderType == 'rights') {
+                    new_activity_type = 'right'
+                    new_deliver = 0
+                    this.rightsSingleData(orderid).then(res => {
+                        this.navigateUrl(res.trade_no,res.amount,new_deliver,new_activity_type)
+                    })
+                }
+                else {
+                    new_activity_type = 'right'
+                    new_deliver = 1
+                    this.rightsSingleData(orderid).then(res => {
+                        this.navigateUrl(res.trade_no,res.amount,new_deliver,new_activity_type)
+                    })
+                }
+            },
+            
+            // 周五福利单订单
+            welfSingleData(tradeNo) {
+                return new Promise((resolve, reject) => {
+                    welfSingle(tradeNo).then(res=>{
+                        resolve(res)
+                    })
+                })
+            },
+            
+            // 权益单订单
+            rightsSingleData(tradeNo) {
+                return new Promise((resolve, reject) => {
+                    rightsSingle(tradeNo).then(res=>{
+                        resolve(res)
+                    })
+                })
+            },
+            
+            // 跳转收银台
+            navigateUrl(orderid,newPrice,new_deliver,new_activity_type) {
+                uni.navigateTo({
+                    url: "/pages/cashier/index?tradeNo=" + orderid + '&price=' + newPrice + "&deliver=" + new_deliver + "&activity_type=" + new_activity_type + "&type=default"
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 活动订单
+    .order-tab {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        display: flex;
+        height: 80rpx;
+        line-height: 80rpx;
+        z-index: 9;
+        background: white;
+        .order-tab-item {
+            font-size: 28rpx;
+            width: 25%;
+            text-align: center;
+            border-bottom: solid 2rpx #f7f7f7;
+            color: #464854;
+            background: white;
+            position: relative;
+            &.active {
+                color: #f57e32;
+            }
+            &::after {
+                content: '';
+                position: absolute;
+                width: 30rpx;
+                height: 4rpx;
+                background: transparent;
+                left: calc(50% - 15rpx);
+                bottom: -2rpx;
+            }
+            &.active::after {
+                background: #f57e32;
+            }
+        }
+    }
+    
+    /* 订单列表 */
+    .order-content {
+        padding: 80rpx 0 20rpx 0;
+        .order-content-li {
+            background: white;
+            margin-top: 20rpx;
+            position: relative;
+            .order-store {
+                padding: 20rpx;
+                border-bottom: solid 1rpx #f3f3f3;
+                display: flex;
+                .order-store-title {
+                    flex: 1;
+                    color: #999;
+                    font-size: 28rpx;
+                }
+                .order-store-stateText {
+                    color: #e6b329;
+                    font-size: 26rpx;
+                    &.red {
+                        color: #e92344;
+                    }
+                    &.green {
+                        color: #79b300;
+                    }
+                }
+            }
+            .order-goods {
+                padding: 20rpx;
+                box-sizing: border-box;
+                position: relative;
+                .order-goods-cover {
+                    width: 150rpx;
+                    height: 150rpx;
+                    vertical-align: top;
+                    border-radius: 4rpx;
+                }
+                .order-goods-content {
+                    position: absolute;
+                    left: 190rpx;
+                    top: 20rpx;
+                    right: 20rpx;
+                    width: calc(100% - 210rpx);
+                    .order-goods-content-name {
+                        margin-bottom: 10rpx;
+                        font-size: 30rpx;
+                        font-weight: 600;
+                    }
+                    .orderVirtual {
+                        background: #88be2d;
+                        color: #fff;
+                        border-radius: 4rpx;
+                        display: inline-block;
+                        font-size: 24rpx;
+                        padding: 2rpx 8rpx;
+                        &.active {
+                            background: #f57e32;
+                        }
+                    }
+                    .order-goods-content-price {
+                        color: #747788;
+                        display: flex;
+                        margin-top: 10rpx;
+                        font-size: 28rpx;
+                        text {
+                            color: #f57e32;
+                            display: inline-block;
+                            margin-right: 10rpx;
+                            font-size: 30rpx;
+                        }
+                    }
+                }
+            }
+            .order-btns {
+                font-size: 25rpx;
+                display: flex;
+                padding: 20rpx;
+                box-sizing: border-box;
+                flex-wrap: wrap;
+                flex-direction: row-reverse;
+                .order-btn {
+                    margin-left: 20rpx;
+                    height: 52rpx;
+                    line-height: 50rpx;
+                    box-sizing: border-box;
+                    border: solid 1rpx #747788;
+                    padding: 0 20rpx;
+                    border-radius: 30rpx;
+                }
+                .order-btn-back {
+                    border-color: #f57e32;
+                    color: #f57e32;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/order/orderData.vue b/pages/order/orderData.vue
new file mode 100644
index 0000000..ef734f3
--- /dev/null
+++ b/pages/order/orderData.vue
@@ -0,0 +1,359 @@
+<template>
+    <view class="">
+        <!-- 订单状态 -->
+        <view class="order-statl">
+        	{{ order.state_text || order.status_text }}
+        	<image v-if="order.state == 'UNPAY'" src="/static/icon/order_icon_00.png" class="order-statl-icon"></image>
+        	<image v-else-if="order.state == 'PAID'" src="/static/icon/order_icon_01.png" class="order-statl-icon"></image>
+        	<image v-else-if="order.state == 'COMPLETED'" src="/static/icon/order_icon_02.png" class="order-statl-icon"></image>
+            <image v-else src="/static/icon/order_icon_02.png" class="order-statl-icon"></image>
+        </view>
+        
+        <!-- 收货人 -->
+        <view class="order-address" v-if="order.express != '' && order.express != null">
+        	<image class="address-icon" src="https://storage.funnyzhibo.com/images/2020/05/06/address_icon.png" mode="widthFix"></image>
+        	<view class="order-address-name nowrap">
+        		收货人：{{ order.express.name }}
+        		<text>{{ order.express.mobile }}</text>
+        	</view>
+        	<view class="order-address-text">{{ order.express.address }}</view>
+        	<image class="order-address-back" src="/static/img/address_back.png" mode="widthFix"></image>
+        </view>
+        
+        <view class="order-goods">
+        	<view class="goods-goods-li">
+        		<image v-if="order.items" class="goods-img" :src="order.items.cover" mode="aspectFill"></image>
+                <image v-else-if="order.source" class="goods-img" :src="order.source.right.cover" mode="aspectFill"></image>
+                
+        		<view class="goods-body">
+        			<view v-if="order.items" class="goods-name nowrap">{{ order.items.title }}</view>
+                    <view v-else-if="order.source" class="goods-name nowrap">{{ order.source.right.title }}</view>
+                    
+        			<view class="goods-price nowrap">
+                        ￥<block v-if="order.items">{{ order.items.price }}</block>
+                        <block v-else-if="order.source">{{ order.source.welfare.price }}</block>
+        				<text class="goods-qty" v-if="order.items">×{{ order.items.qty }}</text>
+                        <text class="goods-qty" v-else>×1</text>
+        			</view>
+        		</view>
+        	</view>
+        </view>
+        
+        <view class="order-total">
+        	<view class="order-total-li order-type">
+        		权益类型
+        		<text>{{ order.type_text || order.type_text }}</text>
+        	</view>
+        	<view class="order-total-li">
+        		订单号
+        		<text @tap="copyText(order.orderid)">{{ order.orderid }}</text>
+        	</view>
+        	<view class="order-total-li">
+        		下单时间
+        		<text>{{ order.created_at }}</text>
+        	</view>
+        </view>
+        <view class="order-total">
+        	<view class="order-total-li">
+        		实际支付
+        		<text class="redCor" v-if="order.total">￥{{ order.total }}</text>
+                <text class="redCor" v-else-if="order.source">￥{{ order.source.welfare.price }}</text>
+        	</view>
+        </view>
+        
+        <view class="order-data-footer" :class="{iphoneX : statusHeight > 30}">
+        	<view class="order-btn" @tap="orderRun">返回订单</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import clipboard from "@/js_sdk/ican-clipBoard/ican-clipBoard.js"
+    import { show, welfaresShow } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                statusHeight : '',
+                orderId      : '',  // 订单id
+                order        : '',  // 订单详情
+                orderType    : ''   // 订单来源
+            }
+        },
+        onLoad(options) {
+            // 获取商品活动订单详情
+            this.orderType = options.orderType
+            this.orderId   = options.id
+            this.orderInfo();
+        },
+        methods:{
+            // 商品活动订单详情
+            orderInfo() {
+                let url = ''
+                if(this.orderType == 'welfare' || this.orderType == 'welfareGoods') url = welfaresShow
+                if(this.orderType == 'rights' || this.orderType == 'rightsCoupons') url = show
+                
+                url(this.orderId).then(res=>{
+                    this.order = res
+                }).catch(err => {});
+            },
+            
+            // 返回上一页
+            orderRun() {
+                uni.navigateBack({
+                    delta: 1
+                })
+            },
+            
+            // 复制快递单号
+            copyText (id) {
+                wx.setClipboardData({
+                    data    : id,
+                    success : res=> {
+                       uni.showToast({
+                           title: '复制成功',
+                           icon: 'none'
+                       })
+                    }
+                })
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+     .order-statl{
+        background-color: #f57e32;
+        padding: 0 30rpx 10rpx;
+        color: white;
+        line-height: 90rpx;
+        height: 90rpx;
+        position: relative;
+    }
+    
+    .order-statl-icon{
+        width: 80rpx;
+        height: 80rpx;
+        vertical-align: middle;
+        position: absolute;
+        right: 30rpx;
+        top: 5rpx;
+    }
+    
+     /* 收货人信息 */
+    .order-address{
+        padding: 30rpx 30rpx 40rpx 100rpx;
+        position: relative;
+        background: white;
+    }
+    
+    .order-address-back{
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        vertical-align:bottom;
+    }
+    
+    .order-address-name{
+        padding-right: 300rpx;
+        position: relative;
+        font-size: 33rpx;
+        padding-bottom: 10rpx;
+        text{
+            position: absolute;
+            right: 0;
+            top: 0;
+            width: 280rpx;
+            text-align: right;
+        }
+    }
+    
+    .order-address-text{
+        color: #464854;
+        font-size: 26rpx;
+    }
+    
+    .address-icon,
+    .arrows-right{
+        position: absolute;
+    }
+    
+    .address-icon{
+        height: 42rpx;
+        width: 42rpx;
+        left: 30rpx;
+        top: calc(50% - 26rpx);
+        top: -webkit-calc(50% - 26rpx);
+    }
+    
+    .arrows-right{
+        height: 28rpx;
+        width: 28rpx;
+        right: 30rpx;
+        top: calc(50% - 19rpx);
+        top: -webkit-calc(50% - 19rpx);
+    }
+    
+    .order-add-address{
+        text-align: center;
+        padding: 30rpx 0;
+    }
+    
+    .order-add-address navigator{
+        display: inline-block;
+        background: #e92344;
+        color: white;
+        line-height: 60rpx;
+        padding: 0 30rpx;
+        margin-right: 20rpx;
+    }
+    
+    /* 订单商品 */
+    
+    .order-content{
+        border-bottom: solid 100rpx transparent;
+    }
+    
+    .order-goods{
+        margin-bottom: 20rpx;
+    }
+    
+    .goods-goods-mall{
+        padding: 20rpx 30rpx 0 30rpx;
+        line-height: 50rpx;
+        image{
+            width: 48rpx;
+            height: 48rpx;
+            vertical-align: middle;
+            margin-right: 15rpx;
+            margin-bottom: 2rpx;
+        }
+    }
+    
+    .goods-goods-li{
+        padding: 20rpx 30rpx;
+        position: relative;
+        border-bottom: solid 1rpx #f2f2f2;
+        min-height: 130rpx;
+        background: white;
+    }
+    
+    .goods-goods-li:last-child{
+        border-bottom: none;
+    }
+    
+    .goods-img{
+        position: absolute;
+        top: 20rpx;
+        left: 30rpx;
+        height: 130rpx;
+        width: 130rpx;
+        background: #f5f6fa;
+    }
+    
+    .goods-body{
+        padding-left: 150rpx;
+    }
+    
+    .goods-name{
+        font-weight: bold;
+        padding: 10rpx 0 20rpx;
+    }
+    
+    .goods-price{
+        color: #e92344;
+    }
+    
+    .goods-qty{
+        color: gray;
+        font-weight: normal;
+        padding-left: 10rpx;
+        font-size: 28rpx;
+    }
+    
+    .goods-params{
+        color: gray;
+        padding-bottom: 20rpx;
+        font-size: 28rpx;
+    }
+    
+    /* 统计信息 */
+    
+    .order-total{
+        background: white;
+        margin: 20rpx 0;
+    }
+    
+    .order-total-li{
+        padding: 0 30rpx;
+        line-height: 90rpx;
+        position: relative;
+        font-size: 28rpx;
+    }
+    
+    .order-total-li::before{
+        position: absolute;
+        content: " ";
+        left: 30rpx;
+        bottom: 0;
+        right: 0;
+        height: 1rpx;
+        background: #f2f2f2;
+    }
+    
+    .order-total-li:last-child::before{
+        display: none;
+    }
+    
+    .order-total-li text{
+        float: right;
+        color: #999;
+    }
+    
+    .order-total-li .redCor {
+        color: #e92344;
+        font-size: 32rpx;
+    }
+    
+    .order-type text {
+        color: #e92344;
+    }
+    
+    /* 底部工具栏 */
+    .order-data-footer{
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        border-top: solid 1rpx #f2f2f2;
+        padding-top: 17rpx;
+        padding-right: 30rpx;
+        padding-left: 30rpx;
+        height: 83rpx;
+        background: white;
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction:row-reverse;
+    }
+    
+    .order-data-footer.iphoneX {
+        padding-bottom: 30rpx;
+    }
+    
+    .order-btn{
+        margin-left: 20rpx;
+        height: 54rpx;
+        line-height: 50rpx;
+        box-sizing: border-box;
+        border:solid 1rpx #747788;
+        padding: 0 20rpx;
+        font-size: 26rpx;
+        border-radius: 40rpx;
+        margin-top: 10rpx;
+    }
+    
+    .order-btn-back {
+        border-color: #f57e32;
+        color: #f57e32;
+    }
+</style>
diff --git a/pages/packet/packet.vue b/pages/packet/packet.vue
new file mode 100644
index 0000000..e382c96
--- /dev/null
+++ b/pages/packet/packet.vue
@@ -0,0 +1,363 @@
+<template>
+    <view>
+        <image class="packetCont-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/packet.png"></image>
+        
+        <view class="packetCont-title">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/packet_title.png" mode="widthFix"></image>
+        </view>
+        <view class="packetText">
+            <image class="packetText-tips" src="https://card.ysd-bs.com/storage/materials/2021/09/01/packetText_top.png" mode="widthFix"></image>
+            <view class="packetText-form">
+                <view class="packetText-title">
+                    <view class="packetText-title-name">请输入办理业务手机号</view>
+                    <text>例：185XXXX0001</text>
+                </view>
+                <form action="" bindsubmit="forgetlogin">
+                    <view class="packetText-label">
+                        <image src="/static/img/packetText_icon.png"></image>
+                        <input class="inputs-input" type="text" placeholder="请输入手机号领取红包" @input="getNameValue"
+                            :value="mobile"></input>
+                    </view>
+                    <view class="packetText-label">
+                        <input class="inputs-code" placeholder="请输入验证码" @input="getCodeValue" :value="code"></input>
+                        <button class="packetText-code" @click="codeBind" hover-class="none">{{codename}}</button>
+                    </view>
+                    <view class="packetText-cozy">
+                        <view class="packetText-cozy-name">温馨提示：</view>
+                        <text>消费红包仅在本系统内使用，有效期12个月</text>
+                        <text>消费红包不找零，不兑现</text>
+                        <text>消费红包兑换成电子券后，不支持退货</text>
+                        <text>如出现电子券核销问题，请致电咨询0451-88895511（9:00-20:00）</text>
+                    </view>
+                    <view class="packetText-btn">
+                        <button type="default" form-type="submit"><text>立即领取</text><image src="/static/img/packet_arr.png"></image></button>
+                    </view>
+                </form>
+            </view>
+        </view>
+        
+        <view class="popBack" :class="{active : popContHide}"></view>
+        <view class="popCont" :class="{active : popContHide}">
+            <image class="popCont-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/receive.png" mode="widthFix"></image>
+            <view class="popCont-text">
+                <view class="popCont-name">领取成功,共领取<text>{{ popData }}</text>,可在账户中查看</view>
+                <view class="popCont-btn" @click="popClick">我知道了 <text v-if="countDownNum > 0">({{ countDownNum }})</text></view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, unicom } from '@/apis/interfaces/auth'
+    export default {
+    	data() {
+    		return {
+                mobile      : '',            // 手机号码
+                code        : '',            // 验证码
+                iscode      : null,          // 用于存放验证码接口里获取到的code
+                codename    : '获取验证码',  // 验证码-文字提示
+                countDownNum: '',           // 提示信息
+                popContHide : false,        // 领取成功弹出
+                popData     : ''           // 领取金额
+            }
+        },
+        onLoad(options) {},
+        methods:{
+            // 获取手机号码
+            getNameValue(e) {
+                this.mobile = e.detail.value
+            },
+            
+            // 获取验证码
+            getCodeValue(e) {
+                this.code = e.detail.value
+            },
+            
+            // code发送
+            codeBind(e){
+                let mobile = this.mobile,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$$/
+                var _this    = this
+                if  (mobile == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobile)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({
+                        mobile  : mobile,
+                        channel :'DEFAULT',
+                        type    :'unicom'
+                    }).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送',
+                                _this.disabled  = false
+                  
+                            } else {
+                                _this.codename  = num + "s后重新获取",
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err => {
+                        uni.showToast({
+                            icon: 'none',
+                            title: err.message
+                        })
+                    })
+                }
+            },
+            
+            // 立即领取
+            forgetlogin(e) {
+                let mobile          = this.mobile,
+                    code            = this.code,
+                    that            = this,
+                    countDownNum    = 5 //获取倒计时初始值 
+                that.countDownNum = countDownNum
+                unicom({
+                    mobile: mobile,
+                    channel: 'DEFAULT',
+                    code: code
+                }).then(res=>{
+                    that.popContHide = !this.popContHide
+                    that.popData     = res
+                    var timerPop = setInterval(function () {
+                        countDownNum--;
+                        that.countDownNum = countDownNum
+                        if (countDownNum <= 0) {
+                            clearInterval(timerPop);
+                            that.countDownNum = 0
+                            uni.switchTab({
+                                url: '/pages/user/index'
+                            })
+                        }
+                    }, 1000)
+                })
+            },
+        
+            // 关闭弹窗
+            popClick() {
+                this.popContHide = !this.popContHide
+                
+                // 跳转
+                uni.switchTab({
+                    url: '/pages/user/index'
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 红包领取 */
+    .packetCont-img {
+        width: 100vw;
+        height: 100vh;
+        position: fixed;
+    }
+    .packetCont-title {
+        width: 100vw;
+        position: absolute;
+        z-index: 1;
+        left: 0;
+        top: 0;
+        text-align: center;
+        margin-top: 60rpx;
+    }
+    .packetText {
+        position: absolute;
+        top: 16%;
+        left: 40rpx;
+        right: 40rpx;
+        text-align: center;
+        .packetText-tips {
+            margin: 0 auto;
+            display: block;
+        }
+        .packetText-form {
+            background: rgba(255, 255, 255, .7);
+            border-radius: 30rpx;
+            padding: 40rpx 40rpx 70rpx 40rpx;
+            box-sizing: border-box;
+            color: #000;
+            text-align: left;
+            margin-bottom: 100rpx;
+            position: relative;
+            .packetText-title {
+                font-weight: 600;
+                font-size: 26rpx;
+                padding: 0 10rpx 40rpx 10rpx;
+                .packetText-title-name {
+                    font-size: 38rpx;
+                    margin-bottom: 10rpx;
+                }
+            }
+            .packetText-label {
+                background-color: #fff;
+                border-radius: 80rpx;
+                margin-bottom: 60rpx;
+                box-shadow: 0 10rpx 10rpx rgba(0, 0, 0, .4);
+                display: flex;
+                padding: 25rpx 30rpx;
+                box-sizing: border-box;
+                image {
+                    width: 40rpx;
+                    height: 40rpx;
+                    margin-top: 2rpx;
+                    margin-right: 30rpx;
+                }
+                .packetText-code {
+                    border: none;
+                    background-color: transparent;
+                    width: auto !important;
+                    padding: 0;
+                    font-weight: normal;
+                    font-size: 32rpx;
+                    line-height: 40rpx !important;
+                    &::after{
+                        display: none;
+                    }
+                }
+                .inputs-input {
+                    position: relative;
+                    padding-left: 30rpx;
+                    &::after,
+                    &::after {
+                        position: absolute;
+                        content: '';
+                        top: 0;
+                        background: #000;
+                        width: 4rpx;
+                        height: 100%;
+                    }
+                    &::after {
+                        left: 0;
+                    }
+                    &::after {
+                        right: 0;
+                    }
+
+                }
+            }
+            .packetText-btn {
+                width: 100%;
+                text-align: center;
+                height: 90rpx;
+                position: absolute;
+                bottom: -40rpx;
+                left: 0;
+                button {
+                    width: 50%;
+                    line-height: 90rpx;
+                    border-radius: 25rpx;
+                    background-image: radial-gradient(#fdcf7c 50%,#fdebb8);
+                    border: none;
+                    font-size: 38rpx;
+                    color: #fff;
+                    margin: 0 auto;
+                    padding: 0;
+                }
+                text{
+                    background: linear-gradient(to bottom, #e38b3c, #cb6418);
+                    -webkit-background-clip: text;
+                    color: transparent;
+                }
+                image {
+                    width: 34rpx;
+                    height: 34rpx;
+                    vertical-align: -4rpx;
+                    margin-left: 14rpx;
+                }
+            }
+
+            .packetText-cozy {
+                font-weight: 600;
+                font-size: 26rpx;
+                text {
+                    display: block;
+                    margin: 15rpx 0;
+                    position: relative;
+                    padding-left: 30rpx;
+                    &::after {
+                        position: absolute;
+                        content: '';
+                        left: 0;
+                        top: 12rpx;
+                        background-color: #000;
+                        width: 12rpx;
+                        height: 12rpx;
+                        border-radius: 50%;
+                    }
+                }
+            }
+        }
+    }
+    
+    /* 弹出 */
+    .popBack {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        background-color: rgba(0, 0, 0, .8);
+        z-index: 8;
+        display: none;
+    }
+    .popCont {
+        position: fixed;
+        z-index: 9;
+        width: 100vw;
+        height: 100vh;
+        text-align: center;
+        display: none;
+        .popCont-text {
+            padding: 0 10rpx;
+            box-sizing: border-box;
+            position: absolute;
+            z-index: 10;
+            left: 20%;
+            top: 340px;
+            width: 60%;
+            .popCont-name {
+                margin-bottom: 50rpx;
+                font-size: 30rpx;
+                text {
+                    font-size: 40rpx;
+                    color: #fd5238;
+                    padding: 0 10rpx;
+                }
+            }
+            .popCont-btn {
+                background-color: #ffea37;
+                color: #ff3900;
+                display: inline-block;
+                border-radius: 80rpx;
+                padding: 20rpx 70rpx;
+                box-shadow: 0 10rpx 10rpx rgba(196, 160, 0, 0.4);
+            }
+        }
+    }
+    .popBack.active,
+    .popCont.active {
+        display: block;
+    }
+</style>
diff --git a/pages/payPassword/forget.vue b/pages/payPassword/forget.vue
new file mode 100644
index 0000000..f8c8fe8
--- /dev/null
+++ b/pages/payPassword/forget.vue
@@ -0,0 +1,140 @@
+<template>
+    <view>
+        <view class="pass">
+            <form @submit="formSubmit">
+                <view class="favourCont-label">
+                    <view class="favourCont-name">手机号：</view>
+                    <input type="number" placeholder="请输入手机号" v-model="mobileNo" />
+                    <button @tap="sendOut" class="obtain" :disabled="senddisabled" hover-class="none">{{ codename }}</button>
+                </view>
+                <view class="favourCont-label">
+                    <view class="favourCont-name">验证码</view>
+                    <input type="number" name="code" placeholder="请输入验证码" />
+                </view>
+                <view class="favourCont-label">
+                    <view class="favourCont-name">新密码：</view>
+                    <input type="number" password name="password" placeholder="请输入新的支付密码" />
+                </view>
+                <view class="favourCont-label">
+                    <view class="favourCont-name">确认密码：</view>
+                    <input type="number" password name="confirmation" placeholder="请再次输入支付密码" />
+                </view>
+                <view class="favourCont-btn">
+                    <button formType="submit" :disabled="disabled">确认设置</button>
+                </view>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                mobileNo    : '', // 手机号
+                codename    : '获取验证码',
+                senddisabled: false, // 获取验证码-按钮提交状态
+                disabled    : false // 按钮提交状态
+            }
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {},
+        methods: {
+            // 发送短信
+            sendOut(e) {
+                var _this = this
+                send({
+                    mobile: this.mobileNo,
+                    channel: 'PAYPASS'
+                }).then(res=>{
+                    uni.showToast({
+                        title   : '发送成功',
+                        icon    : 'success',
+                        duration: 2000
+                    })
+                    var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                        if (num <= 0) {
+                            clearInterval(timer);
+                            _this.codename     = '重新发送'
+                            _this.senddisabled = false
+                
+                        } else {
+                           _this.codename     = num + "s后重新获取"
+                           _this.senddisabled = true
+                        }
+                        }, 1000)
+                }).catch(err=>{}) 
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .favourCont-label {
+        background-color: #fff;
+        height: 120rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        position: relative;
+        input {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100rpx;
+            line-height: 100rpx;
+            font-size: 30rpx;
+            padding-left: 220rpx;
+            box-sizing: border-box;
+        }
+    }
+    
+    .favourCont-name {
+        line-height: 100rpx;
+    }
+    
+    .favourCont-btn {
+        width: 100%;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        margin-top: 50rpx;
+        button {
+            background-color: #3a3b3e;
+            color: #fff;
+            width: 100% !important;
+            height: 90rpx;
+            line-height: 90rpx;
+            font-size: 32rpx;
+        }
+        
+    }
+    
+    .forget {
+        text-align: center;
+        line-height: 90rpx;
+        font-size: 30rpx;
+    }
+    
+    .obtain {
+        color: #d6571f;
+        background: none;
+        border: none;
+        font-size: 30rpx;
+        position: absolute;
+        width: auto !important;
+        text-align: right;
+        line-height: 100rpx;
+        z-index: 9;
+        padding: 0;
+        margin: 0;
+        right: 20rpx;
+        top: 0;
+    }
+</style>
diff --git a/pages/payPassword/index.vue b/pages/payPassword/index.vue
new file mode 100644
index 0000000..5085359
--- /dev/null
+++ b/pages/payPassword/index.vue
@@ -0,0 +1,53 @@
+<template>
+    <view>
+        <navigator :url="'/pages/payPassword/setup?passType=' + passType" class="label">
+            <view class="label-name">
+                支付密码
+            </view>
+            <view class="label-more">
+                {{ passType ? '已设置' : '未设置' }}<image src="/static/icon/rightsArrow.png"></image>
+            </view>
+        </navigator>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                passType : '',   // 是否是首次设置密码
+            }
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            const Paypass = uni.getStorageSync("hasPaypass")
+            this.passType = Paypass
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {},
+        methods: {}
+    }
+</script>
+<style lang="scss" scoped>
+    .label {
+        background-color: #fff;
+        display: flex;
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        height: 90rpx;
+        line-height: 90rpx;
+        .label-name {
+            flex: 1;
+        }
+        .label-more {
+            display: flex;
+            color: #999;
+            image {
+                width: 40rpx;
+                height: 40rpx;
+                margin: 28rpx 0 0 10rpx;
+            }
+        }
+    }
+</style>
diff --git a/pages/payPassword/setup.vue b/pages/payPassword/setup.vue
new file mode 100644
index 0000000..ab9307f
--- /dev/null
+++ b/pages/payPassword/setup.vue
@@ -0,0 +1,141 @@
+<template>
+    <view>
+        <view class="pass">
+            <form @submit="formSubmit">
+                <view class="favourCont-label" v-if="passType">
+                    <view class="favourCont-name">旧密码：</view>
+                    <input type="number" password name="oldPassword" placeholder="请输入旧密码" />
+                </view>
+                <view class="favourCont-label">
+                    <view class="favourCont-name">{{ passType ? '新密码' : '输入密码' }}：</view>
+                    <input type="number" password name="password" placeholder="请输入支付密码" />
+                </view>
+                <view class="favourCont-label">
+                    <view class="favourCont-name">确认密码：</view>
+                    <input type="number" password name="confirmation" placeholder="请再次输入支付密码" />
+                </view>
+                <view class="favourCont-btn">
+                    <button formType="submit" :disabled="disabled">确认设置</button>
+                    <navigator hover-class="none" url="/pages/payPassword/forget" class="forget" v-if="passType">忘记密码， 立即找回？</navigator>
+                </view>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { setPassword, changePassword } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                passSource  : '',    // 设置密码跳转来源favourUrl为转账跳转
+                passType    : '',    // 是否是首次设置密码
+                disabled    : false, // 设置支付密码
+                password    : '',    // 支付密码
+                confirmation: ''     // 确认密码
+            }
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 检查用户登录状态
+            const Paypass = uni.getStorageSync("hasPaypass")
+    
+            this.passType  = Paypass
+            this.passSource= options.source
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {},
+        methods: {
+            // 设置密码
+            formSubmit(e) {
+                let newoldPassword= e.detail.value.oldPassword,
+                    newPassword   = e.detail.value.password,
+                    newFormSubmit = e.detail.value.confirmation
+        
+                let newUrl = '' //定义接口来源名称
+        
+                if(this.passType == false) newUrl = setPassword({password: newPassword, password_confirmation: newFormSubmit})
+                if(this.passType == true) newUrl = changePassword({old_password: newoldPassword, password: newPassword, password_confirmation: newFormSubmit})
+        
+                newUrl.then(res=>{
+                    // 已设置密码缓存
+                    uni.setStorage({
+                        key     : 'hasPaypass',
+                        data    : true
+                    })
+                    this.disabled = true
+                    uni.showToast({
+                        title: '设置成功',
+                    })
+        
+                    // 只有从转账页面跳转才回到上一页
+                    if(this.passSource == "favourUrl") {
+                        setTimeout(()=>{
+                            uni.navigateBack({delta: 1})
+                        },2000)
+        
+                        return
+                    }
+        
+                    // 其他跳转回到用户中心
+                    setTimeout(()=>{
+                        uni.switchTab({
+                            url: '/pages/user/index'
+                        })
+                    },2000)
+                }).catch(err => {});
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .favourCont-label {
+        background-color: #fff;
+        height: 120rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        position: relative;
+        input {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100rpx;
+            line-height: 100rpx;
+            font-size: 30rpx;
+            padding-left: 220rpx;
+            box-sizing: border-box;
+        }
+    }
+    
+    .favourCont-name {
+        line-height: 100rpx;
+    }
+    
+    .favourCont-btn {
+        width: 100%;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        margin-top: 50rpx;
+        button {
+            background-color: #3a3b3e;
+            color: #fff;
+            width: 100% !important;
+            height: 90rpx;
+            line-height: 90rpx;
+            font-size: 32rpx;
+        }
+        
+    }
+    
+    .forget {
+        text-align: center;
+        line-height: 90rpx;
+        font-size: 30rpx;
+        color: #d6571f;
+        font-weight: 600;
+    }
+</style>
diff --git a/pages/payView/payView.vue b/pages/payView/payView.vue
new file mode 100644
index 0000000..c96e118
--- /dev/null
+++ b/pages/payView/payView.vue
@@ -0,0 +1,37 @@
+<template>
+    <view class="content"></view>
+</template>
+
+<script>
+    import { wechatCode } from '@/apis/interfaces/authUrl'
+    export default {
+    	data() {
+    		return {
+                
+    		}
+    	},
+        onLoad(options) {
+            // 获取微信code
+            wechatCode({
+                code: options.code
+            }).then(res => {
+				this.$store.commit('setOpenId', res.openid)
+				this.$Router.push({
+					name: this.$Route.query.pageName
+				})
+			}).catch(err => {
+            	uni.showToast({
+            		title: err.message,
+            		icon: "none"
+            	})
+            })
+        },
+    	onShow() {
+    	    
+    	},
+    	methods: {}
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/pages/rights/index.vue b/pages/rights/index.vue
new file mode 100644
index 0000000..9aa37da
--- /dev/null
+++ b/pages/rights/index.vue
@@ -0,0 +1,970 @@
+<template>
+    <view>
+        <!-- 重要提示 -->
+        <view class="rightsPoint">
+        	<view class="rightsPoint-cont">
+        		<view class="rightsPoint-top">
+        			<image src="/static/icon/Point_icon.png"></image>
+        			<text>重要提示</text>
+        		</view>
+        		<view class="rightsPoint-text" :class="{active : notes.pointMoreShow}">
+        			<rich-text :nodes="notes.notification"></rich-text>
+        		</view>
+        		<view class="pointMore" @click="pointMoreTap">
+        			<text>{{ notes.pointMoreShow == true ? '收起' : '展开' }}</text>
+        			<image :src="notes.pointMoreShow == true ? '/static/img/pointMore-up.png' : '/static/img/pointMore.png'">
+        			</image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 权益内容 -->
+        <view style="padding-bottom: 220px">
+            <!-- 权益logo -->
+        	<view class="cont">
+        		<view class="contBack">
+        			<image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png" mode="scaleToFill"></image>
+        			<view class="classCircle"></view>
+        			<view class="rightsCont">
+        				<scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+        					<view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+        						<image :src="item" mode="aspectFill"></image>
+        					</view>
+        				</scroll-view>
+        				<view class="nowrap rightsCont-btn">
+        					{{ rightData.detail.three_title }}
+        				</view>
+        			</view>
+        		</view>
+        	</view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{rightData.detail.amount}}</view>
+                        <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" @click="goodsNumber('plus')">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 金额 -->
+            <view class="rightsList" v-if="rightData.detail">
+                <view class="rightsLabel">
+                    <view class="rightsLabel-left">{{ rightData.detail.attribute.form_type }}</view>
+                    <view class="rightsLabel-right rightsLabel-red">-￥{{ rightData.detail.score }}</view>
+                </view>
+            </view>
+            
+            <!-- 规格 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" style="margin-top: 20rpx">
+                    <view class="rightsLabel" v-if="buyWay.platIndex == 1">
+                        <view class="rightsLabel-left">电子券</view>
+                        <view class="rightsLabel-right">{{ rightData.detail.qty }}张</view>
+                    </view>
+                    <block v-if="rightData.detail.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">请选择提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="https://card.ysd-bs.com/storage/materials/2021/09/01/new_rightsAddress.png"></image>
+                            <view v-if="rightData.addressSee != ''" class="rightsLabel-right" @click="addressTap">
+                                <view class="rightsLabel-address-text">
+                                    <view class="rightsLabel-address-name">
+                                        {{ rightData.addressSee.name }}<view class="rightsLabel-address-tel">{{ rightData.addressSee.mobile }}</view>
+                                    </view>
+                                    <text class="nowrap">{{ rightData.addressSee.all_address }}</text>
+                                </view>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                            <navigator v-else class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                    添加收货地址
+                                </view>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </navigator>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right">￥{{ rightData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+           
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <view class="noticeText-top">购买须知</view>
+                    <view class="noticeText-cont">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+        
+                    <view class="noticeText-top">内容介绍</view>
+                    <view class="noticeText-cont">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 购买按钮 -->
+        <block v-if="fromType == 'unionpay'">
+        	<view class="rightsBtn" @click="unionUrl" v-if="openid == ''">
+        		<text>立即领取</text>
+        	</view>
+        	<view class="rightsBtn" :class="{active : rightsTap == true}" v-else>
+        		<text v-if="rightsTap == true">立即购买</text>
+        		<text v-else @click="unionOrder">立即购买</text>
+        	</view>
+        </block>
+        <view class="newrightsBtn" @tap="submitOrder" v-else>
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ rightData.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ rightData.total }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        
+        <!-- 选择收货地址 -->
+        <view class="addressBack" :class="{active : address.addressShow}" @click="addressTap"></view>
+        <view class="addressCont" :class="{active : address.addressShow}">
+        	<view class="addressCont-title">
+        		<view class="addressCont-left">请选择收货地址</view>
+        		<view class="addressCont-right" @click="addSelect">新增收货地址</view>
+        	</view>
+        	<scroll-view class="header-classify" scroll-y="true">
+        		<view class="addressCont-list" v-for="(item,index) in address.allAddress" :key="index"
+        			@click="selectAddress(item.id, item)">
+        			<view class="addressCont-top">
+        				<view class="addressCont-name">{{ item.name }}</view>
+        				<view class="addressCont-tel">{{ item.mobile }}</view>
+        			</view>
+        			<view class="addressCont-text">
+        				{{ item.all_address }}
+        			</view>
+        			<view class="address-tool-icon">选择地址</view>
+        		</view>
+        	</scroll-view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, rightStore, wechat, unionpay, unionCode } from '@/apis/interfaces/rights'
+    export default {
+		data() {
+			return {
+				rightData: {
+                    detail    : '',  // 权益内容
+                    rightId   : '',  // 权益id
+                    addressSee: '',  // 收货地址
+                    num       : 1,   // 购买数量
+                    moreAmount: '',  // 产品总金额
+                    freight   : '',  // 运费
+                    total     : ''   // 总金额
+                },
+                buyWay        : {
+                    platformCp: [],  // 选择提交数组
+                    platIndex : 0,   // 选择提交方式下标
+                    isdeliver : -1   // 选择提交方式
+                },
+                address        : {
+                    allAddress : [],      // 收货地址列表
+                    addressShow: false    // 地址显示状态
+                },
+                notes         : {
+                    notification  : '',  // 重要提示-内容
+                    pointMoreShow : false// 重要提示-展开收起
+                },
+                notice        : {
+                    remark    : '',     // 购买须知
+                    content   : '',     // 内容介绍
+                    noticeShow: true   // 购买须知状态
+                },
+                fromType      : '',     // H5来源  unionpay银联
+                uniUrl        : '',     // 跳转H5页面
+                openid        : '',     // 银联是否存在openid
+                rightsTap     : false,  // 是否跳转H5
+                disabled      : false   // 下单按钮状态
+			}
+		},
+		onLoad(e) {
+            this.rightData.rightId = e.id
+            this.openid   = e.openid || ''
+        },
+        onShow() { 
+            // 获取权益详情
+            this.rightsInfo();
+        },
+		methods: {
+            // 权益详情
+            rightsInfo() {
+                index({
+                    right_id   : this.rightData.rightId,
+                    address_id : this.rightData.addressSee.id,
+                    num        : this.rightData.num,
+                    is_deliver : this.buyWay.isdeliver
+                }).then(res => {
+                    let obj    = res.detail.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.def_get
+                        }
+                        if(res.detail.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.fromType             = res.detail.from
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notes.notification   = res.detail.notification.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.rightData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.rightData.num = num
+        
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 输入商品数量
+            goodsNumberInput(e){
+                let goodsNum   = e.detail.value
+                if (goodsNum > 0){
+                    this.rightData.num = goodsNum
+                }else{
+                    uni.showToast({
+                        title   : '商品数量不能小于1',
+                        icon    : 'none'
+                    })
+                    this.rightData.num = goodsNum
+                }
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 重要提示展开-收起
+            pointMoreTap() {
+                this.notes.pointMoreShow = !this.notes.pointMoreShow
+            },
+            
+            // 选择提交方式
+            platBind(e) {
+                this.buyWay.platIndex = e.detail.value
+                this.buyWay.isdeliver = this.buyWay.platformCp[e.detail.value].value
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收货地址弹出
+            addressTap() {
+                this.address.addressShow = !this.address.addressShow
+            },
+            
+            // 选择收货地址
+            selectAddress(id, item){
+                let new_addressId = id,
+                    addressId     = this.rightData.addressSee.id
+                if (new_addressId != addressId) {
+                    this.rightData.addressSee = item
+                    this.address.addressShow  = false
+                }else{
+                    this.address.addressShow  = false
+                }
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 只有银联商品获取
+            unionOrder() {
+                // 更新openid
+                unionCode({
+                    openid: this.openid
+                }).then(res=>{})
+                this.submitOrder();
+            },
+            
+            // 银联获取openid跳转
+            unionUrl() {
+                if(this.openid == '') {
+                    this.openid = this.rightData.detail.union_openid
+                }
+                if(this.fromType == 'unionpay') {
+                    if(this.rightData.detail.union_openid == '') {
+                        unionpay({
+                            callback_url: '/pages/rights/index?id=' + this.rightData.detail.right_id,
+                            callback_type: 'wxmini',
+                            right_id: this.rightData.rightId
+                        }).then(res=>{
+                            // #ifdef H5
+                            window.location.href = res
+                            // #endif
+                        }).catch(err => {});
+                    }
+                }
+            },
+            
+            // 支付提交
+            submitOrder() {
+                // 收货方式
+                if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.rightData.detail.def_get
+                let rightId     = this.rightData.detail.right_id,
+                    addressId   = this.rightData.addressSee.id,
+                    isDeliver   = this.buyWay.isdeliver,
+                    newQty      = this.rightData.num
+                rightStore({
+                    right_id    : rightId,
+                    address_id  :addressId,
+                    is_deliver  : isDeliver,
+                    qty         : newQty
+                }).then(res=>{
+                    if(res.canPay == false) {
+                        uni.showToast({
+                            title   : '支付成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        setTimeout(()=>{
+                            if(this.buyWay.isdeliver == 1) {
+                                uni.reLaunch({
+                                    url: '/pages/order/order?orderType=rightsCoupons'
+                                })
+                            } else {
+                                uni.reLaunch({
+                                    url: '/pages/order/order?orderType=rights'
+                                })
+                            }
+                        },3000)
+                        this.rightsTap = true
+                    }else {
+                        // 跳转收银台
+                        uni.navigateTo({
+                            url: "/pages/cashier/index?tradeNo=" + res.trade_no + "&price=" + this.rightData.total + "&deliver=" + this.buyWay.isdeliver + "&activity_type=" + res.type + "&type=default"
+                        })
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 重要提示 */
+    .rightsPoint {
+        position: fixed;
+        left: 0;
+        bottom: 160rpx;
+        background: #eeeeee;
+        z-index: 9;
+        width: 100%;
+        padding: 20rpx 20rpx 10rpx;
+        box-sizing: border-box;
+        .rightsPoint-cont {
+            width: 100%;
+            background: #eeeeee;
+            border-radius: 10rpx;
+            position: relative;
+            max-height: 50vh;
+            overflow-y: scroll;
+            .rightsPoint-top {
+                font-size: 28rpx;
+                display: flex;
+                padding: 0 20rpx 20rpx;
+                box-sizing: border-box;
+                font-weight: 600;
+                image {
+                    width: 36rpx;
+                    height: 36rpx;
+                    margin-right: 10rpx;
+                }
+            }
+            .rightsPoint-text {
+                padding: 0 20rpx;
+                box-sizing: border-box;
+                font-size: 24rpx;
+                line-height: 44rpx;
+                height: 90rpx;
+                transition: height 25s;
+                overflow: hidden;
+                &.active {
+                    height: auto;
+                    transition: 2s;
+                }
+            }
+            .pointMore {
+                text-align: center;
+                width: 100%;
+                background: #eeeeee;
+                height: 80rpx;
+                line-height: 82rpx;
+                position: relative;
+                margin-top: 10rpx;
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+                text {
+                    font-size: 28rpx;
+                    color: #c38e00;
+                    animation: dong 1.8s infinite;
+                    display: inline-block;
+                }
+                image {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-left: 4rpx;
+                    vertical-align: -4rpx;
+                    animation: dong 1.8s infinite;
+                }
+                @keyframes dong {
+                    0% {
+                        transform: translate(0px, 0px);
+                    }
+                
+                    50% {
+                        transform: translate(0px, -6rpx);
+                    }
+                
+                    100% {
+                        transform: translate(0px, 0px);
+                    }
+                }
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        margin-bottom: 30rpx;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 卡券权益内容
+    .cont {
+        width: 100%;
+        overflow: hidden;
+    }
+    .contBack {
+        position: relative;
+        width: 200%;
+        height: 340rpx;
+        left: -50%;
+        text-align: center;
+        background: #000000;
+        border-radius: 0 0 100% 100%;
+        overflow: hidden;
+        &::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .classBack {
+            position: absolute;
+            left: 28%;
+            right: 30%;
+            width: 44%;
+            top: 40rpx;
+        }
+        .classCircle {
+            position: relative;
+            &::before {
+                position: absolute;
+                border-radius: 50%;
+                content: '';
+                z-index: 1;
+                background-color: rgba(255,255,255,.1);
+                left: 20%;
+                top: -20rpx;
+                width: 260rpx;
+                height: 260rpx;
+            }
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .rightsCont-tips {
+                color: #fff;
+            }
+            .welfareCont-top {
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 规格权益
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        box-sizing: border-box;
+    }
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 30rpx;
+        box-sizing: border-box;
+        color: #6f7880;
+        font-size: 30rpx;
+        .rightsLabel-left {
+            flex: 1;
+            color: #747d86;
+        }
+        .rightsLabel-right {
+            display: flex;
+            font-size: 28rpx;
+            font-weight: 700;
+            &.rightsLabel-red{
+                color: #ff5b5d;
+            }
+            &.rightsLabel-score {
+                font-size: 34rpx;
+                color: #000000;
+            }
+        }
+        .rightsLabel-range {
+            display: flex;
+            color: #000;
+            font-weight: 600;
+        }
+        .rightsLabel-row {
+            width: 38rpx;
+            height: 38rpx;
+            margin: 2rpx 0 0 6rpx;
+        }
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        margin-top: 30rpx;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    // 购买按钮
+    .rightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 100rpx;
+        z-index: 9;
+        background: #fff;
+        button,
+        text {
+            display: block;
+            margin: 12rpx 30rpx;
+            width: calc(100% - 60rpx) !important;
+            height: 74rpx !important;
+            line-height: 74rpx !important;
+            padding: 0;
+            background: #eacf88;
+            text-align: center;
+            border-radius: 60rpx;
+            font-size: 30rpx;
+        }
+    }
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 收货地址新增样式
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+    }
+    
+    .rightsLabel-address::after,
+    .rightsLabel-address::before {
+        position: absolute;
+        content: '';
+        left: 30rpx;
+        width: calc(100% - 60rpx);
+        height: 2rpx;
+        background-color: #bfbfbf;
+    }
+    
+    .rightsLabel-address::after {
+        top: 0;
+    }
+    
+    .rightsLabel-address::before {
+        bottom: 0;
+    }
+    
+    .rightsLabel-address text {
+        display: inline-block;
+        width: calc(100% - 46rpx);
+    }
+    
+    .rightsLabel-address .rightsLabel-right {
+        width: calc(100% - 90rpx);
+        margin-left: 20rpx;
+        color: #000000;
+    }
+    
+    .rightsLabel-address-text {
+        flex: 1;
+    }
+    
+    .rightsLabel-address .rightsLabel-row {
+        margin-top: 30rpx;
+    }
+    
+    .rightsLabel .rightsLabel-icon {
+        width: 70rpx;
+        height: 70rpx;
+        margin-top: 14rpx;
+    }
+    
+    .rightsLabel-address-name {
+        display: flex;
+        font-size: 32rpx;
+        margin-bottom: 10rpx;
+    }
+    
+    .rightsLabel-address-tel {
+        padding-left: 30rpx;
+        color: #959595;
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/setUpForm/form_submit.vue b/pages/setUpForm/form_submit.vue
new file mode 100644
index 0000000..37c4be2
--- /dev/null
+++ b/pages/setUpForm/form_submit.vue
@@ -0,0 +1,232 @@
+<template>
+    <view>
+        <view class="content">
+            <!-- 表单 -->
+            <form @submit="uploadFile">
+                <view class="head_img" @click="upShopLogo" v-if="type == 'avatar'">
+                    <view class="upLoad">
+                        <image class="upLoadBack" :src="avatar" mode="aspectFill"></image>
+                        <image class="upLoadImg" :src="userimg" mode="aspectFill"></image>
+                        <view class="upLoadEdit">更换头像</view>
+                    </view>
+                </view>
+                <view class="form" v-if="type == 'username'">
+                    <view class="form-input">
+                        <label class="form-input-label">昵称</label>
+                        <input placeholder="输入昵称" :value="nickname" name="nickname"></input>
+                    </view>
+                </view>
+                <view class="form-btn">
+                    <button form-type="submit" :disabled="disabledOk">保存</button>
+                </view>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, upload } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                type        : '',   // 跳转来源 avatar为设置头像  username为修改昵称
+                userData    : '',   // 用户信息
+                avatar      : '',   // 用户头像
+                userimg     : '',   // 用户新上传头像
+                nickname    : '设置昵称',   // 用户昵称
+                disabledOk  : false // 提交按钮状态
+            }
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.type = options.type
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 获取用户信息
+            this.userInfo();
+        },
+    
+        methods: {
+            // 用户信息
+            userInfo() {
+                index().then(res => {
+                    this.avatar = res.info.avatar
+                    this.nickname = res.info.nickname
+                }).catch(err => {});
+            },
+            
+            // 选择相册方式
+            upShopLogo(e) {
+                uni.showActionSheet({
+                    itemList: ['从相册中选择', '拍照'],
+                    itemColor: "#f7982a",
+                    success: res=> {
+                    if (!res.cancel) {
+                        if (res.tapIndex == 0) {
+                              this.chooseWxImageShop('album');//从相册中选择
+                        }else if (res.tapIndex == 1) {
+                                 this.chooseWxImageShop('camera');//手机拍照
+                            }
+                        }
+                    }
+                })
+            },
+            
+            // 从相册中选择
+            chooseWxImageShop (type) {
+                uni.chooseImage({
+                    sizeType    : ['original', 'compressed'],
+                    sourceType  : [type],
+                    success: res=> {
+                        var tempFilePaths = res.tempFilePaths
+                        uni.showLoading({
+                            title: '上传中'
+                        })
+                        uni.uploadFile({
+                            url     : 'https://lifetest.ysd-bs.com/api/storage',
+                            filePath: tempFilePaths[0],
+                            name    : 'file',
+                            success : res => {
+                                var userData = JSON.parse(res.data)
+                                this.userimg = userData.data.showpath
+                                uni.hideLoading()
+                            }
+                        })
+                    }
+                })
+            },
+            
+            // 表单提交
+            uploadFile(e) {
+                let newName  = e.detail.value.nickname,
+                    newType  = '',
+                    newValue = ''
+                    
+                if (this.type == "avatar") {
+                    newType = 'avatar'
+                    newValue = this.userimg
+                }
+                
+                if (this.type == "username") {
+                    newType = 'nickname'
+                    newValue = newName
+                }
+                
+                upload({
+                    type: newType,
+                    value: newValue
+                }).then(res=>{
+                    uni.showToast({
+                        title: res
+                    })
+                    setTimeout(()=>{
+                        uni.switchTab({
+                            url: '/pages/user/index'
+                        });
+                    },2000)
+                    
+                    this.disabledOk = true
+                }).catch(err => {});
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .leftbtn-icon{
+    	width: 38rpx;
+    	vertical-align: middle;
+    	margin-bottom: 4rpx;
+    }
+    
+    /* 表单 */
+    .upLoad {
+        position: relative;
+        width: 200rpx;
+        height: 200rpx;
+        z-index: 9;
+        margin: 50rpx auto 0;
+        border-radius: 50%;
+        overflow: hidden;
+    }
+    
+    .upLoadBack {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        z-index: 9;
+        left: 0;
+        top: 0;
+    }
+    
+    .upLoadImg {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        z-index: 99;
+    }
+    
+    .upLoadEdit {
+        position: absolute;
+        width: 100%;
+        height: 60rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 10;
+        background: rgba(0, 0, 0, .3);
+        text-align: center;
+        line-height: 60rpx;
+        color: #fff;
+        font-size: 26rpx;
+        opacity: .9;
+    }
+    /* 提交按钮 */
+    
+    .form-btn{
+        padding: 30rpx 30rpx;
+        width: 100%;
+        box-sizing: border-box;
+    }
+    
+    .form-btn button{
+        background: #000000;
+        color: white;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 32rpx;
+        padding: 0 !important;
+        margin: 40rpx 0 0!important;
+        width: 100% !important;
+    }
+    
+    /* 表单 */
+    
+    .form{
+        background: white;
+        display: block;
+    }
+    
+    .form-input-label{
+        position: absolute;
+        left: 30rpx;
+        width: 100rpx;
+        line-height: 90rpx;
+    }
+    
+    .form-input {
+        padding-left: 140rpx;
+        padding-right: 30rpx;
+        position: relative;
+        height: 90rpx;
+    }
+    
+    .form-input input{
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+    }
+</style>
diff --git a/pages/setUpForm/index.vue b/pages/setUpForm/index.vue
new file mode 100644
index 0000000..924358e
--- /dev/null
+++ b/pages/setUpForm/index.vue
@@ -0,0 +1,72 @@
+<template>
+    <view>
+        <navigator hover-class="none" url="/pages/setUpForm/form_submit?type=avatar" class="setupLabel">
+            <view class="setupLabel-name">
+                头像设置
+            </view>
+            <image src="/static/icon/rightsArrow.png"></image>
+        </navigator>
+        <navigator hover-class="none" url="/pages/setUpForm/form_submit?type=username" class="setupLabel">
+            <view class="setupLabel-name">
+                用户昵称
+            </view>
+            <image src="/static/icon/rightsArrow.png"></image>
+        </navigator>
+        <navigator hover-class="none" url="/pages/payPassword/index" class="setupLabel">
+            <view class="setupLabel-name">
+                支付密码
+            </view>
+            <image src="/static/icon/rightsArrow.png"></image>
+        </navigator>
+        <view class="setupLabel" @click="delStorage">
+            <view class="setupLabel-name">
+                退出登录
+            </view>
+            <image src="/static/icon/rightsArrow.png"></image>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {}
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {},
+    
+        methods: {
+            // 退出登录
+            delStorage() {
+                uni.clearStorage()
+                uni.navigateTo({
+                    url:'/pages/auth/login'
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .setupLabel {
+        display: flex;
+        background-color: #fff;
+        margin-bottom: 20rpx;
+        padding: 0 20rpx;
+        width: 100%;
+        box-sizing: border-box;
+        line-height: 100rpx;
+        font-size: 28rpx;
+        .setupLabel-name {
+            flex: 1;
+        }
+        image {
+            width: 40rpx;
+            height: 40rpx;
+            margin-top: 30rpx;
+        }
+    }
+</style>
diff --git a/pages/site/create.vue b/pages/site/create.vue
new file mode 100644
index 0000000..72a02d7
--- /dev/null
+++ b/pages/site/create.vue
@@ -0,0 +1,250 @@
+<template>
+    <view>
+        <form @submit="siteform" class="site-form">
+        	<view class="site-input">
+        		<label>收货人</label>
+        		<input placeholder="请输入收货人姓名" name="name" :value="fromData.name"></input>
+        	</view>
+        	<view class="site-input">
+        		<label>手机号码</label>
+        		<input placeholder="请输入手机号码" name="mobile" type="number" :value="fromData.mobile"></input>
+        	</view>
+        	<view class="site-input">
+                <label>所在省份</label>
+                <picker @change="areasChange" :value="area.areaIndex" :range="area.areas" :range-key="'name'" name="province_id">
+                    <view class="picker" v-if="area.areas[area.areaIndex]">
+                        {{ area.areas[area.areaIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        	<view class="site-input">
+                <label>所在城市</label>
+                <picker @change="cityDrop" :value="city.cityIndex" :range="city.cityList" :range-key="'name'" class="conneColor" name="city_id">
+                    <view class="picker" v-if="city.cityList[city.cityIndex]">
+                        {{ city.cityList[city.cityIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        
+            <view class="site-input">
+                <label>所在区域</label>
+                <picker @change="regiDrop" :value="regi.regiIndex" :range="regi.regiList" :range-key="'name'" class="conneColor" name="district_id">
+                    <view class="picker" v-if="regi.regiList[regi.regiIndex]">
+                        {{ regi.regiList[regi.regiIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        	<view class="site-input">
+        		<label>收货地址</label>
+        		<input placeholder="请输入详细地址" name="address" :value="fromData.address"></input>
+        	</view>
+        
+        	<view class="site-switch" v-if="fromData.type != 'Compile'">
+                <text>设置默认地址</text>
+                <switch style='zoom:.6;' @change="addressDefault" color="#f57e32"/>
+            </view>
+        
+        	<view class="site-btn">
+        		<button form-type="submit" size="mini">保存</button>
+        	</view>
+        </form>
+    </view>
+</template>
+
+<script>
+    import { create, children, add } from '@/apis/interfaces/address'
+    export default {
+    	data() {
+    		return {
+                fromData: {
+                    addressId  : '', // 地址id
+                    type       : '', // 类型
+                    defaultVal :'',  // 是否为默认地址
+                    name       : '', // 姓名
+                    mobile     : '', // 手机号
+                    address    : '', // 地址内容
+                },
+                
+                // 省份选择
+                area: { 
+                    areas      : [],
+                    areaSn     : '',
+                    areaIndex  : 0,
+                },
+        
+                // 市级选择
+                city: {
+                    cityList   : [],
+                    cityId     : 0,
+                    cityIndex  : 0,
+                },
+        
+                // 区域选择
+                regi: {
+                    regiList   : [],
+                    regiId     : 0,
+                    regiIndex  : 0,
+                }
+            }
+        },
+        onLoad(options) {
+            // 获取省信息
+            this.getProvince()
+        },
+        methods:{
+            // 省信息
+            getProvince() {
+                create().then(res=>{
+                    let areaArr    =  res.provinces,
+                        areaIndex  =  this.area.areaIndex
+                        
+                    this.area.areaSn   = areaArr[areaIndex].code
+                    this.area.areas    = areaArr
+                    this.citylist(areaArr[areaIndex].code)
+                })
+            },
+            
+            // 所在省份
+            areasChange(e) {
+                let area     = this.area.areas,
+                    index    = e.detail.value,
+                    atcode   = area[index].code
+                if (index != this.area.areaIndex) {
+                    this.area.areaIndex  = index
+                    this.area.areaSn     = atcode
+        
+                    // 获取市级列表
+                    this.citylist(atcode)
+                }
+            },
+            
+            // 市级列表
+            citylist(code) {
+                children(code).then(res=>{
+                    let cityArr = res
+                    this.city.cityId    = cityArr[0].code
+                    this.city.cityList  = cityArr
+                    this.city.cityIndex = 0
+                    this.regilist(cityArr[0].code)
+                })
+            },
+            
+            // 市级下拉筛选
+            cityDrop(e) {
+                let city     = this.city.cityList,
+                    index    = e.detail.value,
+                    citycode = city[index].code
+                if (index != this.area.areaIndex) {
+                    this.city.cityIndex = index
+                    this.city.cityId    = citycode
+        
+                    // 获取市级列表
+                    this.regilist(citycode)
+                }
+            },
+            
+            // 区列表
+            regilist(areaCode) {
+                children(areaCode).then(res=>{
+                    this.regi.regiList  = res
+                    this.regi.regiId    = res[0].code
+                    this.regi.regiIndex = 0
+                })
+            },
+            
+            // 区下拉筛选
+            regiDrop(e) {
+                let newIndex = e.detail.value
+                this.regi.regiIndex  = newIndex
+                this.regi.regiId     = this.regi.regiList[newIndex].code
+            },
+            
+            // 设为默认地址
+            addressDefault(e) {
+                this.fromData.defaultVal = e.detail.value
+            },
+            
+            // 保存信息
+            siteform(e) {
+                add({
+                    name        : e.detail.value.name,
+                    mobile      : e.detail.value.mobile,
+                    province_id : this.area.areaSn,
+                    city_id     : this.city.cityId,
+                    district_id : this.regi.regiId,
+                    address     : e.detail.value.address,
+                    def         : this.fromData.defaultVal
+                }).then(res=>{
+                    uni.navigateBack()
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .site-form {
+        background: white;
+        display: block;
+        .site-input {
+            padding: 0 30rpx 0 200rpx;
+            position: relative;
+            line-height: 90rpx;
+            min-height: 90rpx;
+            &::before {
+                position: absolute;
+                bottom: 0;
+                left: 30rpx;
+                right: 0;
+                height: 1rpx;
+                content: "";
+                background: #e4e6f2;
+            }
+            &:last-child::before {
+                display: none;
+            }
+            label {
+                position: absolute;
+                left: 30rpx;
+                top: 0;
+            }
+            input {
+                height: 90rpx;
+            }
+            image {
+                width: 38rpx;
+                height: 38rpx;
+                position: absolute;
+                right: 20rpx;
+                top: calc(50% - 19rpx);
+            }
+        }
+        .site-btn {
+            padding: 20rpx 30rpx;
+            button[size="mini"] {
+                width: 100%;
+                background: #f57e32;
+                height: 80rpx;
+                line-height: 80rpx;
+                font-size: 30rpx;
+                color: white;
+                padding: 0;
+            }
+        }
+        .site-switch {
+            font-size: 32rpx;
+            margin: 30rpx;
+            display: flex;
+            line-height: 40rpx;
+            text {
+                flex: 1;
+            }
+        }
+        .site-switch-active {
+            color: #797979;
+        }
+    }
+</style>
diff --git a/pages/site/edit.vue b/pages/site/edit.vue
new file mode 100644
index 0000000..8496aed
--- /dev/null
+++ b/pages/site/edit.vue
@@ -0,0 +1,278 @@
+<template>
+    <view>
+        <form @submit="siteform" class="site-form">
+        	<view class="site-input">
+        		<label>收货人</label>
+        		<input placeholder="请输入收货人姓名" name="name" :value="fromData.name"></input>
+        	</view>
+        	<view class="site-input">
+        		<label>手机号码</label>
+        		<input placeholder="请输入手机号码" name="mobile" type="number" :value="fromData.mobile"></input>
+        	</view>
+        	<view class="site-input">
+                <label>所在省份</label>
+                <picker @change="areasChange" :value="area.areaIndex" :range="area.areas" :range-key="'name'" name="province_id">
+                    <view class="picker" v-if="area.areas[area.areaIndex]">
+                        {{ area.areas[area.areaIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        	<view class="site-input">
+                <label>所在城市</label>
+                <picker @change="cityDrop" :value="city.cityIndex" :range="city.cityList" :range-key="'name'" class="conneColor" name="city_id">
+                    <view class="picker" v-if="city.cityList[city.cityIndex]">
+                        {{ city.cityList[city.cityIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        
+            <view class="site-input">
+                <label>所在区域</label>
+                <picker @change="regiDrop" :value="regi.regiIndex" :range="regi.regiList" :range-key="'name'" class="conneColor" name="district_id">
+                    <view class="picker" v-if="regi.regiList[regi.regiIndex]">
+                        {{ regi.regiList[regi.regiIndex].name }}
+                    </view>
+        			<image src="/static/icon/rightsArrow.png"></image>
+                </picker>
+            </view>
+        	<view class="site-input">
+        		<label>收货地址</label>
+        		<input placeholder="请输入详细地址" name="address" :value="fromData.address"></input>
+        	</view>
+        
+        	<view class="site-switch" v-if="fromData.type != 'Compile'">
+                <text>设置默认地址</text>
+                <switch style='zoom:.6;' @change="addressDefault" color="#f57e32"/>
+            </view>
+        
+        	<view class="site-btn">
+        		<button form-type="submit" size="mini">保存</button>
+        	</view>
+        </form>
+    </view>
+</template>
+
+<script>
+    import { edit, keep } from '@/apis/interfaces/address'
+    export default {
+    	data() {
+    		return {
+                fromData: {
+                    addressId  : '', // 地址id
+                    type       : '', // 类型
+                    defaultVal :'',  // 是否为默认地址
+                    name       : '', // 姓名
+                    mobile     : '', // 手机号
+                    address    : '', // 地址内容
+                },
+                
+                // 省份选择
+                area: { 
+                    areas      : [],
+                    areaSn     : '',
+                    areaIndex  : 0,
+                },
+        
+                // 市级选择
+                city: {
+                    cityList   : [],
+                    cityId     : 0,
+                    cityIndex  : 0,
+                },
+        
+                // 区域选择
+                regi: {
+                    regiList   : [],
+                    regiId     : 0,
+                    regiIndex  : 0,
+                }
+            }
+        },
+        onLoad(options) {
+            this.fromData.type = options.type
+            this.fromData.addressId = options.id
+            
+            // 获取收货人信息
+            this.getUserAddress();
+        },
+        methods:{
+            // 收货人信息
+            getUserAddress(){
+                edit(this.fromData.addressId).then(res=>{
+                    console.log(res)
+                    let areasValue = res.provinces.findIndex(val=> val.name == res.address.province_name),
+                        cityValue  = res.cities.findIndex(val=> val.name == res.address.city_name),
+                        regiValue  = res.districts.findIndex(val=> val.name == res.address.district_name)
+                    this.fromData.name        = res.address.name
+                    this.fromData.mobile      = res.address.mobile
+                    this.fromData.address     = res.address.address
+                    this.fromData.defaultVal  = res.address.is_default
+                    
+                    this.area.areas       = res.provinces
+                    this.area.areaSn      = res.address.province_id
+                    this.area.areaIndex   = areasValue
+                    
+                    this.city.cityList    = res.cities
+                    this.city.cityId      = res.address.city_id
+                    this.city.cityIndex   = cityValue
+                    
+                    this.regi.regiList    = res.districts
+                    this.regi.regiId      = res.address.district_id
+                    this.regi.regiIndex   = regiValue
+                })
+            },
+            
+            // 省信息
+            getProvince() {
+                create().then(res=>{
+                    let areaArr    =  res.provinces,
+                        areaIndex  =  this.area.areaIndex
+                    this.area.areaSn   = areaArr[areaIndex].code
+                    this.area.areas    = areaArr
+                    this.citylist(areaArr[areaIndex].code)
+                })
+            },
+            
+            // 所在省份
+            areasChange(e) {
+                let area     = this.area.areas,
+                    index    = e.detail.value,
+                    atcode   = area[index].code
+                if (index != this.area.areaIndex) {
+                    this.area.areaIndex  = index
+                    this.area.areaSn     = atcode
+        
+                    // 获取市级列表
+                    this.citylist(atcode)
+                }
+            },
+            
+            // 市级列表
+            citylist(code) {
+                children(code).then(res=>{
+                    let cityArr = res
+                    this.city.cityId    = cityArr[0].code
+                    this.city.cityList  = cityArr
+                    this.city.cityIndex = 0
+                    this.regilist(cityArr[0].code)
+                })
+            },
+            
+            // 市级下拉筛选
+            cityDrop(e) {
+                let city     = this.city.cityList,
+                    index    = e.detail.value,
+                    citycode = city[index].code
+                if (index != this.area.areaIndex) {
+                    this.city.cityIndex = index
+                    this.city.cityId    = citycode
+        
+                    // 获取市级列表
+                    this.regilist(citycode)
+                }
+            },
+            
+            // 区列表
+            regilist(areaCode) {
+                children(areaCode).then(res=>{
+                    this.regi.regiList  = res
+                    this.regi.regiId    = res[0].code
+                    this.regi.regiIndex = 0
+                })
+            },
+            
+            // 区下拉筛选
+            regiDrop(e) {
+                let newIndex = e.detail.value
+                this.regi.regiIndex  = newIndex
+                this.regi.regiId     = this.regi.regiList[newIndex].code
+            },
+            
+            // 设为默认地址
+            addressDefault(e) {
+                this.fromData.defaultVal = e.detail.value
+            },
+            
+            // 保存信息
+            siteform(e) {
+                keep(this.fromData.addressId, {
+                    name        : e.detail.value.name,
+                    mobile      : e.detail.value.mobile,
+                    province_id : this.area.areaSn,
+                    city_id     : this.city.cityId,
+                    district_id : this.regi.regiId,
+                    address     : e.detail.value.address,
+                    def         : this.fromData.defaultVal
+                }).then(res=>{
+                    uni.navigateBack()
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .site-form {
+        background: white;
+        display: block;
+        .site-input {
+            padding: 0 30rpx 0 200rpx;
+            position: relative;
+            line-height: 90rpx;
+            min-height: 90rpx;
+            &::before {
+                position: absolute;
+                bottom: 0;
+                left: 30rpx;
+                right: 0;
+                height: 1rpx;
+                content: "";
+                background: #e4e6f2;
+            }
+            &:last-child::before {
+                display: none;
+            }
+            label {
+                position: absolute;
+                left: 30rpx;
+                top: 0;
+            }
+            input {
+                height: 90rpx;
+            }
+            image {
+                width: 38rpx;
+                height: 38rpx;
+                position: absolute;
+                right: 20rpx;
+                top: calc(50% - 19rpx);
+            }
+        }
+        .site-btn {
+            padding: 20rpx 30rpx;
+            button[size="mini"] {
+                width: 100%;
+                background: #f57e32;
+                height: 80rpx;
+                line-height: 80rpx;
+                font-size: 30rpx;
+                color: white;
+                padding: 0;
+            }
+        }
+        .site-switch {
+            font-size: 32rpx;
+            margin: 30rpx;
+            display: flex;
+            line-height: 40rpx;
+            text {
+                flex: 1;
+            }
+        }
+        .site-switch-active {
+            color: #797979;
+        }
+    }
+</style>
diff --git a/pages/site/index.vue b/pages/site/index.vue
new file mode 100644
index 0000000..c96c04d
--- /dev/null
+++ b/pages/site/index.vue
@@ -0,0 +1,206 @@
+<template>
+    <view>
+        <view class="address-list" v-if="addressArr.length">
+        	<view class="address" v-for="(item,index) in addressArr" :key="index">
+        		<view class="address-name">{{ item.name }}<text>{{ item.mobile }}</text></view>
+        		<view class="address-info">
+        			<block v-if="type == 'selectAddress'">
+        				<text class="address-info-tag" v-if="item.is_default">默认</text>
+        			</block>
+        			{{ item.all_address }}
+        		</view>
+        		<view class="address-tool" v-if="type == 'selectAddress'">
+        			<view class="address-tool-btn yellow" @click="selectAddress(index)">
+        				<image src="/static/icon/choice.png"></image>
+        				选择地址
+        			</view>
+        		</view>
+        		<view class="address-tool" v-else>
+        			<view class="address-tool-btn" @click="addressRemove(item.id, index)">删除</view>
+        			<navigator class="address-tool-btn" :url="'edit?type=Compile' + '&id=' + item.id">编辑</navigator>
+        			<block v-if="item.is_default == 0">
+        				<view class="address-tool-btn acitve" @click="addressDefault(item.id)">
+        					<image src="/static/icon/select.png"></image>设为默认地址
+        				</view>
+        			</block>
+        			<block v-else>
+        				<view class="address-tool-btn acitve">
+        					<image src="/static/icon/select_avtive.png"></image>默认地址
+        				</view>
+        			</block>
+        		</view>
+        	</view>
+        </view>
+        
+        <view class="pack-center pages-hint" v-else>
+        	<image src="https://www.lvmeimall.com/assets/mobile/img/address_null_icon.png"></image>
+        	<view>还未添加收货地址</view>
+        </view>
+        
+        <view class="address-footer">
+        	<navigator url="create?type=Add">添加地址</navigator>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, remove, setdef } from '@/apis/interfaces/address'
+    export default {
+    	data() {
+    		return {
+                type         : '', //来源类型
+                addressArr   : []  //收货地址
+            }
+        },
+        onLoad(options) {
+            this.type = options.type
+        },
+        onShow(){
+            // 获取地址列表
+            this.addressInfo();
+        },
+        methods:{
+            // 地址列表
+            addressInfo(){
+                index().then(res=>{
+                    this.addressArr = res
+                })
+            },
+            
+            // 删除地址
+            addressRemove(newid, newindex){
+                let list  = this.addressArr
+                uni.showModal({
+                    title   : '提示',
+                    content : '是否删除地址',
+                    success : res=> {
+                        if (res.confirm) {
+                            uni.showLoading({
+                                title: '删除中',
+                            })
+                            remove(newid).then(res=>{
+                                this.addressArr = list
+                                uni.showToast({
+                                    title: res,
+                                    icon : "none"
+                                })
+                                list.splice(newindex, 1)
+                                uni.hideLoading()
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 设为默认地址
+            addressDefault(newid){
+                setdef(newid).then(res=>{
+                    // 获取地址列表
+                    this.addressInfo();
+                    uni.showToast({
+                        title: res,
+                        icon : "none"
+                    })
+                })
+            },
+            
+            // 选择地址
+            selectAddress(e){
+                let atAdds  = this.addressArr[e.currentTarget.dataset.index]
+                let pages   = getCurrentPages()
+                let nowPage = pages[ pages.length - 1]   // 当前页页面实例
+                let prevPage= pages[ pages.length - 2 ] // 上一页页面实例
+                prevPage.$vm.address.allAddress = atAdds     // 修改上一页data里面的参数值为
+                uni.navigateBack({
+                    delta: 1
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .address-list{
+        border-bottom: 110rpx solid transparent;
+        .address{
+            padding: 20rpx 30rpx;
+            border-bottom: solid 20rpx #f2f2f2;
+            background: white;
+            .address-name{
+                font-size: 32rpx;
+                line-height: 50rpx;
+                text{
+                    color: #747788;
+                    padding-left: 10rpx;
+                    font-size: 28rpx;
+                }
+            }
+            .address-info{
+                padding-bottom: 20rpx;
+                display: flex;
+            }
+            .address-tool{
+                overflow: hidden;
+                .address-tool-btn{
+                    margin-left: 30rpx;
+                    float: right;
+                    border:solid 1rpx #c0c0c0;
+                    height: 46rpx;
+                    line-height: 44rpx;
+                    padding: 0 30rpx;
+                    border-radius: 6rpx;
+                    font-size: 24rpx;
+                    &.yellow {
+                        border:solid 1rpx #f57e32;
+                        color: #f57e32;
+                        padding: 0 14rpx;
+                        height: 50rpx;
+                        line-height: 50rpx;
+                    }
+                    &.acitve{
+                        float: left;
+                        margin-left: 0;
+                        padding: 0;
+                        border: none;
+                        color: #747788;
+                        font-size: 26rpx;
+                    }
+                    image {
+                        width: 30rpx;
+                        height: 30rpx;
+                        margin-right: 4rpx;
+                        vertical-align: -6rpx;
+                    }
+                    &.acitve image{
+                        margin-right: 10rpx;
+                        vertical-align: -7rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    /* footer */
+    .address-footer{
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding-left: 30rpx;
+        padding-right: 30rpx;
+        background: white;
+        z-index: 9;
+        height: 110rpx;
+        navigator{
+            width: 100%;
+            line-height: 80rpx;
+            height: 80rpx;
+            margin: 15rpx 0;
+            text-align: center;
+            background: #f57e32;
+            font-size: 30rpx;
+            color: white;
+            border-radius: 10rpx
+        }
+    }
+</style>
diff --git a/pages/store/details.vue b/pages/store/details.vue
new file mode 100644
index 0000000..e66190b
--- /dev/null
+++ b/pages/store/details.vue
@@ -0,0 +1,230 @@
+<template>
+    <view>
+        <!-- 门店详情 -->
+        <view class="detailsImg">
+            <image :src="storeinfo.cover" mode="aspectFill"></image>
+        </view>
+        <view class="detailsCont">
+            <view class="detailsName">
+                {{ storeinfo.title }}
+            </view>
+            <view class="detailsLabel">
+                <view class="detailsLabel-left">
+                    <image src="/static/static/icon/site_icon.png"></image>
+                    <view class="detailsLabel-name">
+                        <text>{{ storeinfo.address }}</text>
+                        距您 {{ distance }}
+                    </view>
+                </view>
+                <image class="detailsLabel-tel" src="/static/icon/tel.png" @tap="tel"></image>
+            </view>
+            <view class="detailsLabel">
+                <view class="detailsLabel-left">
+                    <image src="/static/icon/time_icon.png"></image>
+                    <view class="detailsLabel-name">
+                        <text>营业时间</text>
+                        <block v-if="storeinfo.open_time != null">{{ storeinfo.open_time }}</block>
+                        <block v-else>00：00</block>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 按钮 -->
+        <view class="detailsBtn">
+            <view class="detailsBtn-cont" @tap="siteMap">
+                去导航
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { storesShow } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+    			storeinfo   : '',   // 门店详情
+    			distance    : 0,    // 门店距离换算
+    			longitude   : 0,    // 门店详情
+    			latitude    : 0,    // 门店详情
+    		};
+    	},
+    	onLoad(options){
+            storesShow({
+                store_id: options.store_id,
+                user_lng: options.user_lng,
+                user_lat: options.user_lat
+            }).then(res => {
+                let distance = res.distance;
+                if (distance > 1000) {
+                    distance = distance / 1000 + "km";
+                } else {
+                    distance = distance + "m";
+                }
+                this.storeinfo = res
+                this.distance  = distance
+            }).catch(err => {
+                if (!err.login) {
+                    if(options.type == 'campus') {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/campus/signin'
+                                    });
+                                }
+                            }
+                        })
+                    }else {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/auth/login'
+                                    });
+                                }
+                            }
+                        })
+                    }
+                }
+            })
+    	},
+    	methods:{
+            // 拨打电话
+            tel(e) {
+                let tel = this.storeinfo.mobile
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+        
+            // 导航
+            siteMap(){
+                uni.openLocation({
+                    latitude    : parseFloat(this.storeinfo.latitude),
+                    longitude   : parseFloat(this.storeinfo.longitude),
+                    address     : this.storeinfo.address
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    /* 门店详情 */
+    .detailsImg {
+        position: relative;
+        width: 100%;
+        padding-top: 60%;
+    }
+    
+    .detailsImg image {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+    }
+    
+    .detailsCont {
+        background: #fff;
+    }
+    
+    .detailsName {
+        font-size: 34rpx;
+        padding: 30rpx;
+        font-weight: 600;
+        box-sizing: border-box;
+    }
+    
+    .detailsLabel {
+        display: flex;
+        padding: 30rpx;
+        box-sizing: border-box;
+        position: relative;
+    }
+    
+    .detailsLabel::after {
+        position: absolute;
+        content: '';
+        left: 0;
+        top: 0;
+        background: #e7e7e7;
+        width: 100%;
+        height: 2rpx;
+    }
+    
+    .detailsLabel-left {
+        width: calc(100%- 40rpx);
+        display: flex;
+        flex: 1;
+        color: #5e5e5e;
+    }
+    
+    .detailsLabel-left image {
+        width: 40rpx;
+        height: 40rpx;
+        margin: 20rpx 20rpx 0 0;
+    }
+    
+    .detailsLabel-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 14rpx;
+    }
+    
+    .detailsLabel-name {
+        font-size: 26rpx;
+        width: calc(100% - 110rpx);
+        margin-right: 10rpx;
+    }
+    
+    .detailsLabel-name text {
+        font-weight: 600;
+        font-size: 30rpx;
+        display: block;
+        margin-bottom: 10rpx;
+    }
+    
+    .detailsLabel-add {
+        width: 34rpx;
+        height: 34rpx;
+        margin-top: 24rpx;
+    }
+    
+    .detailsBtn {
+        background: #fff;
+        width: 100%;
+        height: 120rpx;
+        text-align: center;
+        left: 0;
+        bottom: 0;
+        position: fixed;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsBtn-cont {
+        width: 100%;
+        background: #ef8e41;
+        color: #fff;
+        height: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        border-radius: 50rpx;
+    }
+</style>
diff --git a/pages/store/index.vue b/pages/store/index.vue
new file mode 100644
index 0000000..8e8a66d
--- /dev/null
+++ b/pages/store/index.vue
@@ -0,0 +1,444 @@
+<template>
+    <view>
+        <!-- 搜索 -->
+        <form @submit="searchForm" class="search">
+            <view class="searchCont">
+                <image src="/static/icon/secrch_icon.png"></image>
+                <input class="search-navigator" name="search" placeholder="请输入门店名称" :value="searchText">
+                <button class="search-btn" form-type="submit">搜索</button>
+            </view>
+        </form>
+
+        <!-- 筛选 -->
+        <view class="screen">
+            <view class="screenLabel">
+                <picker @change="regi" data-type="areasList" :value="areaIndex" :range="areasList" :range-key="'name'"
+                    name="district_id">
+                    <view class="nowrap picker" v-if="areasList[areaIndex]">
+                        {{ areasList[areaIndex].name }}
+                    </view>
+                    <image class="screenLabel-arrow" src="/static/icon/arrow_down.png"></image>
+                </picker>
+            </view>
+            <view class="screenLabel">
+                <picker @change="regi" data-type="cityList" :value="cityIndex" :range="cityList" :range-key="'name'"
+                    name="district_id">
+                    <view class="nowrap picker" v-if="cityList[cityIndex]">
+                        {{ cityList[cityIndex].name }}
+                    </view>
+                    <image class="screenLabel-arrow" src="/static/icon/arrow_down.png"></image>
+                </picker>
+            </view>
+            <view class="screenLabel">
+                <picker @change="regi" data-type="regiList" :value="regiIndex" :range="regiList" :range-key="'name'"
+                    name="district_id">
+                    <view class="nowrap picker" v-if="regiList[regiIndex]">
+                        {{ regiList[regiIndex].name }}
+                    </view>
+                    <image class="screenLabel-arrow" src="/static/icon/arrow_down.png"></image>
+                </picker>
+            </view>
+        </view>
+
+        <!-- 门店列表 -->
+        <view class="storeList" v-if="storesList.length > 0">
+            <view v-for="(item, index) in storesList" :key="index" class="detailsStore-list" @tap="detailsTap"
+                :data-id="(item.store_id)">
+                <image :src="item.cover" class="detailsStore-logo"></image>
+                <view class="detailsStore-cont">
+                    <view class="nowrap detailsStore-name">{{ item.title }}</view>
+                    <view class="detailsStore-place">
+                        <text class="nowrap">{{ item.address }}</text>
+                        {{ item.km }}
+                    </view>
+                </view>
+            </view>
+            <view class="pagesLoding" v-if="lodingStats">
+                <block v-if="page.has_more">
+                    <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix">
+                    </image>加载中...
+                </block>
+                <block v-else>
+                    没有更多了~
+                </block>
+            </view>
+        </view>
+
+        <!-- 商家为空 -->
+        <view class="pack-center pages-hint" v-else>
+            <image src="/static/img/null_icon.png"></image>
+            <view>暂无商家</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import QQMapWX from '@/utils/qqmap-wx-jssdk.min.js'
+    import { stores, areas } from '@/apis/interfaces/user'
+    export default {
+        data() {
+            return {
+                storesList: [],
+                //门店列表
+                couponId: 0,
+                //优惠券id
+                searchText: '',
+                //搜索关键字
+                longitude: 0,
+                //经度
+                latitude: 0,
+                //纬度
+                //省份选择
+                areasList: [],
+                areaIndex: 0,
+                //市级选择
+                cityList: [],
+                cityIndex: 0,
+                //区域选择
+                regiList: [],
+                regiIndex: 0,
+                page: {
+                    has_more: false
+                },
+                //下一页
+                lodingStats: false, //加载状态
+                qqMap: new QQMapWX({
+                    key: '4KYBZ-LCAKF-QWOJN-NIDNZ-FZHLZ-2XFW7',
+                    vm: this
+                }),
+                type : ''  //跳转来源  campus为校园活动跳转
+            }
+        },
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 跳转来源
+            this.type = options.type
+            // 优惠券id
+            this.couponId = options.id
+            
+            // 获取定位 - 使用腾讯地图sdk
+            uni.getLocation({
+                success: res => {
+                    this.longitude = res.longitude
+                    this.latitude  = res.latitude
+                    // 调用接口
+                    this.qqMap.reverseGeocoder({
+                        location: {
+                            latitude: res.latitude,
+                            longitude: res.longitude
+                        },
+                        success: res => {
+                            if(res.message == "query ok"){
+                                let addressInfo = res.result.address_component
+                                // 获取门店列表
+                                this.storesInfo(addressInfo);
+                            }else{
+                                uni.showToast({
+                                    title: res.message,
+                                    icon : 'none'
+                                })
+                            }
+                        },
+                        fail: res => {},
+                        complete: res => {}
+                    });
+                }
+            });
+        },
+
+        methods: {
+            // 门店列表
+            storesInfo(addressInfo, page) {
+                let title       = this.searchText || ""
+                let province_id = "",
+                    city_id     = "",
+                    district_id = "",
+                    newcity     = this.cityList,
+                    newAreas    = this.areasList,
+                    regiList    = this.regiList,
+                    areaIndex   = this.areaIndex,
+                    cityIndex   = this.cityIndex,
+                    regiIndex   = this.regiIndex
+                if(!addressInfo){
+                    province_id = this.areasList[this.areaIndex].code
+                    city_id     = this.cityList[this.cityIndex].code
+                    district_id = this.regiList[this.regiIndex].code
+                }
+                stores({
+                    coupon_id: this.couponId,
+                    province_id: province_id,
+                    city_id: city_id,
+                    district_id: district_id,
+                    title: this.searchText || "",
+                    user_lng: this.longitude,
+                    user_lat: this.latitude,
+                    page: page
+                }).then(res=>{
+                    let newStores = this.storesList,
+                        newData = []
+                    if(page == 1 || page == undefined) newStores = []
+                    newData = newStores.concat(res.stores.data)
+                    newData.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    if(addressInfo){
+                        newcity   = res.citys
+                        newAreas  = res.provinces
+                        areaIndex = newAreas.findIndex(val => val.name == addressInfo.province)
+                        cityIndex = newcity.findIndex(val => val.name == addressInfo.city)
+                        this.getAreas(newcity[cityIndex].code, '')
+                    }
+                    
+                    this.storesList  = newData
+                    this.cityList    = newcity
+                    this.cityIndex   = cityIndex
+                    this.areasList   = newAreas
+                    this.areaIndex   = areaIndex
+                    this.page        = res.stores.page
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                })
+            },
+            
+            // 获取区级信息
+            getAreas(sn, areasData){
+                areas(sn).then(res=>{
+                    let newRegi      = res,
+                        newregiIndex = 0
+                    if(areasData) newregiIndex = newRegi.findIndex(val => val.name == areasData)
+                    this.regiList    = newRegi
+                    this.regiIndex   = newregiIndex
+                }).catch(err => {
+                    if (!err.login) {
+                        if(this.type == 'campus') {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/campus/signin'
+                                        });
+                                    }
+                                }
+                            })
+                        }else {
+                            uni.showModal({
+                                title: '用户登录已过期',
+                                content: '请重新登录',
+                                showCancel: false,
+                                success: res => {
+                                    if (res.confirm) {
+                                        uni.redirectTo({
+                                            url: '/pages/auth/login'
+                                        });
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 选择城市信息
+            regi(e){
+                let chantType  = e.currentTarget.dataset.type,
+                    chantIndex = e.detail.value,
+                    name       = ""
+                    
+                if(chantType == "areasList"){
+                    name = "areaIndex"
+                    this.areaIndex = chantIndex
+                }else if(chantType == "cityList"){
+                    name = "cityIndex"
+                    this.getAreas(this.cityList[chantIndex].code, "")
+                    this.cityIndex = chantIndex
+                }else if(chantType == "regiList"){
+                    name = "regiIndex"
+                    this.regiIndex = chantIndex
+                }
+                    
+                // 获取门店列表
+                this.storesInfo()
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                  url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat,
+                })
+            },
+        
+            // 搜索门店
+            searchForm(e) {
+                this.searchText = e.detail.value.search
+        
+                // 获取门店列表
+                this.storesInfo()
+            },
+        
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.page = pageNumber
+                    this.storesInfo('', pageNumber)
+                }
+            }
+        }
+    }
+</script>
+<style>
+    /* 搜索 */
+    .search {
+        background: #fff;
+        position: fixed;
+        width: 100%;
+        left: 0;
+        top: 0;
+        height: 110rpx;
+        z-index: 99;
+    }
+    
+    .searchCont {
+        background: #f7f7f7;
+        border-radius: 50rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 28rpx;
+        margin: 20rpx 20rpx 0;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        display: flex;
+    }
+    
+    .searchCont image {
+        width: 34rpx;
+        height: 34rpx;
+        margin: 24rpx 20rpx 0 0;
+    }
+    
+    .searchCont input {
+        height: 100%;
+        width: calc(100% - 150rpx);
+    }
+    
+    .searchCont button {
+        background: transparent;
+        width: 100rpx !important;
+        text-align: center;
+        padding: 0 !important;
+        margin: 0 !important;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 30rpx;
+        color: #ff9b1a;
+    }
+    
+    .search-btn::after {
+        display: none;
+    }
+    
+    /* 筛选 */
+    .screen {
+        background: #fff;
+        position: fixed;
+        width: 100%;
+        left: 0;
+        top: 110rpx;
+        height: 90rpx;
+        overflow: hidden;
+        z-index: 99;
+    }
+    
+    .screenLabel {
+        float: left;
+        width: calc(33.33% - 20rpx);
+        text-align: center;
+        color: #5f5f5f;
+        line-height: 90rpx;
+        font-size: 28rpx;
+        margin: 0 10rpx;
+    }
+    
+    .screenLabel picker {
+        width: calc(100% - 17rpx);
+        position: relative;
+    }
+    
+    .screenLabel-arrow {
+        position: absolute;
+        right: 0;
+        top: calc(50% - 17rpx);
+        width: 34rpx;
+        height: 34rpx;
+    }
+    
+    /* 门店列表 */
+    
+    .storeList {
+        background: #fff;
+        padding: 20rpx;
+        box-sizing: border-box;
+        margin-top: 220rpx;
+        padding-bottom: 40rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 120rpx;
+        height: 120rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 150rpx;
+        top: 10rpx;
+        width: calc(100% - 150rpx);
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+</style>
diff --git a/pages/subscribe/combo/combo.vue b/pages/subscribe/combo/combo.vue
new file mode 100644
index 0000000..5e37400
--- /dev/null
+++ b/pages/subscribe/combo/combo.vue
@@ -0,0 +1,299 @@
+<template>
+    <view>
+        
+        <view class="header">
+            <image class="header-card" src="https://card.ysd-bs.com/storage/materials/2021/09/01/combo-card.png" mode="widthFix"></image>
+            <image class="header-back" src="https://card.ysd-bs.com/storage/materials/2021/09/01/subscribe-back.png" mode="widthFix"></image>
+        </view>
+        
+        <view class="combo">
+            <view class="combo-title">*请选择套餐类型</view>
+            <view class="combo-tabs">
+                <view class="combo-item" :class="{show : comboId === item.business_item_id}" v-for="(item, index) in tops" :key="index" @tap="onCombo(item.business_item_id)">
+                    <view class="combo-item-header">
+                        <view class="combo-item-title">{{ item.title || '-' }}</view>
+                        <view class="combo-item-price">¥{{ item.price || '-' }}</view>
+                    </view>
+                    <view class="combo-item-info">
+                        <image v-if="item.cover != ''" :src="item.cover" mode="widthFix"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <view class="nets">
+            <view class="nets-title">*请选择套餐类型</view>
+            <view class="combo-tabs">
+                <view class="combo-item nets-item" :class="{show : comboId === item.business_item_id}" v-for="(item, index) in nets" :key="index" @tap="onCombo(item.business_item_id)">
+                    <view class="combo-item-header">
+                        <view class="combo-item-title">{{ item.title || '-' }}</view>
+                        <view class="combo-item-price">¥{{ item.price || '-' }}</view>
+                    </view>
+                    <view class="combo-item-info">
+                        <image v-if="item.cover != ''" :src="item.cover" mode="widthFix"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 提交预约表单 -->
+        <form class="combo-from" @submit="comboSubmit">
+            <view class="from-title">预约信息</view>
+            <view class="from-submit">*请填写预约信息</view>
+            <input class="from-input" type="text" name="name" placeholder="请输入姓名" :value="name" />
+            <input class="from-input" type="number" name="phone" placeholder="请输入手机号" :value="phone" />
+            <button class="from-button" size="default" form-type="submit">立即预约</button>
+        </form>
+        
+        <!-- 客服电话 -->
+        <view class="service">
+            <view @tap="callPhone">
+                <view>客服热线：{{ mobile }}</view>
+                <view class="callPhone">拨打客服电话</view>
+            </view>
+        </view>
+
+    </view>
+</template>
+
+<script>
+    import { business, create } from '@/apis/interfaces/subscribe'
+    export default {
+    	data() {
+    		return {
+                businessId  : '',
+                comboId     : '',
+                mobile      : '',
+                phone       : '',
+                name        : '',
+                tops        : [],
+                nets        : []
+            }
+        },
+        onLoad() {
+            business(2).then(res => {
+                this.businessId = res.business_id
+                this.mobile     = res.mobile
+                this.tops       = res.items.top
+                this.nets       = res.items.network
+            })
+        },
+        onShow() {},
+        methods:{
+            // 拨打电话
+            callPhone(){
+                uni.makePhoneCall({
+                    phoneNumber: this.mobile,
+                    fail(){}
+                })
+            },
+            
+            // 提交表单
+            comboSubmit(e){
+                let formValue = e.detail.value
+        
+                if(this.comboId === ''){
+                    uni.showToast({
+                        title: "请选择套餐类型",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                if(formValue.name === ''){
+                    uni.showToast({
+                        title: "请输入预约人姓名",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                if(formValue.phone === ''){
+                    uni.showToast({
+                        title: "请输入预约办理手机号码",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                create({
+                    business_id     : this.businessId,
+                    business_item_id: this.comboId,
+                    type            : '',
+                    mobile          : formValue.phone,
+                    username        : formValue.name
+                }).then(res => {
+                    uni.showModal({
+                        title       : "提示",
+                        icon        : res,
+                        showCancel  : false,
+                        confirmColor: "#252f4b",
+                        success     : modalRes => {
+                            if(modalRes.confirm){
+                                this.phone = ''
+                                this.name  = ''
+                            }
+                        }
+                    })
+                }).catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : "none"
+                    })
+                })
+            },
+        
+            // 选择套餐
+            onCombo(id){
+                this.comboId = id
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .header{
+        position: relative;
+        background: linear-gradient(to top, #575a85, #252f4b);
+        padding: 60rpx 60rpx 0;
+    }
+    
+    .header-card{
+        vertical-align: top;
+    }
+    
+    .header-back{
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        vertical-align: top;
+    }
+    
+    /* 套餐类型 */
+    .combo{
+        background: white;
+        padding: 30rpx;
+    }
+    
+    .combo-title{
+        font-size: 26rpx;
+        color: #910000;
+    }
+    
+    .combo-tabs{
+        margin: 0 -10rpx;
+        padding-top: 20rpx;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    
+    .combo-item{
+        margin: 10rpx;
+        width: calc(33.33% - 20rpx);
+        box-sizing: border-box;
+        
+    }
+    
+    .combo-item.show > .combo-item-header{
+        background: white;
+        box-shadow: 3rpx 0 4rpx 4rpx rgba(255, 152, 0, .13);
+    }
+    
+    .combo-item-header{
+        background: #fffbf4;
+        border:solid 1rpx #e3a03a;
+        border-bottom: none;
+        border-radius: 20rpx 20rpx 0 0;
+        text-align: center;
+        padding: 20rpx;
+    }
+    
+    .combo-item-title{
+        font-size: 28rpx;
+        color: #2d2d2d;
+    }
+    
+    .combo-item-price{
+        font-weight: bold;
+        font-size: 48rpx;
+        color: #e3a03a;
+    }
+    
+    .combo-item-info{
+        background: #9e652a;
+        border-radius: 0 0 20rpx 20rpx;
+        font-size: 24rpx;
+        text-align: center;
+        color: white;
+        overflow: hidden;
+        image{
+            width: 100%;
+        }
+    }
+    
+    .nets{
+        padding: 30rpx;
+        border-top: solid 20rpx #e8e8e8;
+    }
+    
+    .nets-title{
+        font-size: 32rpx;
+        color: #9e652a;
+    }
+    
+    .nets-item{
+        width: calc(50% - 20rpx);
+    }
+    
+    /* 预约表单 */
+    .combo-from{
+        display: block;
+        padding: 30rpx 50rpx;
+        border-top: solid 20rpx #e8e8e8;
+        background: white;
+    }
+    
+    .from-title{
+        font-size: 34rpx;
+    }
+    
+    .from-submit{
+        padding: 10rpx 0;
+        font-size: 26rpx;
+        color: #910000;
+    }
+    
+    .from-input{
+        background: #e2e2e2;
+        height: 90rpx;
+        border-radius: 40rpx;
+        margin-top: 30rpx;
+        padding: 0 30rpx;
+    }
+    
+    .from-button[size="default"]{
+        background: #252f4b;
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0;
+        margin-top: 30rpx;
+        font-weight: normal;
+        color: white;
+        border-radius: 40rpx;
+    }
+    
+    /* 客服电话 */
+    .service{
+        padding: 60rpx;
+        text-align: center;
+        background: #e8e8e8;
+        font-size: 28rpx;
+    }
+    
+    .callPhone{
+        color: #252f4b;
+    }
+
+</style>
diff --git a/pages/subscribe/upgrade/upgrade.vue b/pages/subscribe/upgrade/upgrade.vue
new file mode 100644
index 0000000..b27bd3b
--- /dev/null
+++ b/pages/subscribe/upgrade/upgrade.vue
@@ -0,0 +1,321 @@
+<template>
+    <view>
+        <view class="header">
+            <image class="header-card" src="https://card.ysd-bs.com/storage/materials/2021/09/01/upgrade-card.png" mode="widthFix"></image>
+            <image class="header-back" src="https://card.ysd-bs.com/storage/materials/2021/09/01/subscribe-back.png" mode="widthFix"></image>
+        </view>
+        
+        <!-- 生效类型 -->
+        <view class="radios">
+            <view class="radios-title">生效时间</view>
+            <view class="radios-subtitle">*请选择升级包生效时间</view>
+            <radio-group class="radios-box" @change="radioChange">
+                <label class="radio-item" v-for="(item, index) in types" :key="index">
+                    {{ item.name }}生效
+                    <radio :value="item.id" :checked="item.id === typeId" color="#252f4b" />
+                </label>
+            </radio-group>
+        </view>
+        
+        <!-- 升级包类型 -->
+        <view class="combo">
+            <view class="combo-title">*请选择升级包类型</view>
+            <view class="combo-tabs">
+                <view class="combo-item" :class="{show : comboId === item.business_item_id}" v-for="(item, index) in item5g" :key="index" @tap="onCombo(item.business_item_id)">
+                    <view class="combo-item-header">
+                        <view class="combo-item-title">{{ item.title || '-' }}</view>
+                        <view class="combo-item-price">¥{{ item.price || '-' }}</view>
+                    </view>
+                    <view class="combo-item-info">
+                        <image v-if="item.cover != ''" :src="item.cover" mode="widthFix"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 提交预约表单 -->
+        <form class="combo-from" @submit="comboSubmit">
+            <view class="from-title">预约信息</view>
+            <view class="from-submit">*请填写预约信息</view>
+            <input class="from-input" type="text" name="name" placeholder="请输入姓名" :value="name" />
+            <input class="from-input" type="number" name="phone" placeholder="请输入手机号" :value="phone" />
+            <button class="from-button" size="default" form-type="submit">立即预约</button>
+        </form>
+        
+        <!-- 客服电话 -->
+        <view class="service">
+            <view@tap="callPhone">
+                <view>客服热线：{{ mobile }}</view>
+                <view class="callPhone">拨打客服电话</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    import { business, create } from '@/apis/interfaces/subscribe'
+    export default {
+    	data() {
+    		return {
+                businessId  : '',
+                comboId     : '',
+                mobile      : '',
+                phone       : '',
+                name        : '',
+                typeId      : '',
+                types       : [],
+                item5g      : []
+            }
+        },
+        onLoad(e) {
+            business(1).then(res => {
+                this.businessId = res.business_id
+                this.mobile     = res.mobile
+                this.types      = res.type
+                this.typeId     = res.type[0].id
+                this.item5g     = res.items['5G']
+            })
+        },
+        onShow() {},
+        methods:{
+            // 拨打电话
+            callPhone(){
+                uni.makePhoneCall({
+                    phoneNumber: this.mobile,
+                    fail(){}
+                })
+            },
+            
+            // 提交表单
+            comboSubmit(e){
+                let formValue = e.detail.value
+                if(this.comboId === ''){
+                    uni.showToast({
+                        title: "请选择套餐类型",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                if(formValue.name === ''){
+                    uni.showToast({
+                        title: "请输入预约人姓名",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                if(formValue.phone === ''){
+                    uni.showToast({
+                        title: "请输入预约办理手机号码",
+                        icon : "none"
+                    })
+                    return
+                }
+        
+                create({
+                    business_id     : this.businessId,
+                    business_item_id: this.comboId,
+                    type            : this.typeId,
+                    mobile          : formValue.phone,
+                    username        : formValue.name
+                }).then(res => {
+                    uni.showModal({
+                        title       : "提示",
+                        icon        : res,
+                        showCancel  : false,
+                        confirmColor: "#252f4b",
+                        success     : modalRes => {
+                            if(modalRes.confirm){
+                                this.phone = ''
+                                this.name  = ''
+                            }
+                        }
+                    })
+                }).catch(err=>{
+                    uni.showToast({
+                        title: err.message,
+                        icon : "none"
+                    })
+                })
+            },
+        
+            // 选择套餐
+            onCombo(id){
+                this.comboId = id
+            },
+        
+            // 选择生效时间
+            radioChange(e){
+                this.typeId = e.detail.value
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+     .header{
+        position: relative;
+        background: linear-gradient(to top, #575a85, #252f4b);
+        padding: 60rpx 60rpx 0;
+    }
+    
+    .header-card{
+        vertical-align: top;
+    }
+    
+    .header-back{
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        vertical-align: top;
+    }
+    
+    /* 生效时间 */
+    .radios{
+        background: white;
+        padding: 30rpx 50rpx;
+        border-bottom: solid 20rpx #e8e8ee;
+    }
+    
+    .radios-title{
+        font-size: 34rpx;
+    }
+    
+    .radios-subtitle{
+        padding: 10rpx 0;
+        font-size: 26rpx;
+        color: #910000;
+    }
+    
+    .radios-box{
+        margin: 0 -10rpx;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    
+    .radio-item{
+        width: calc(50% - 20rpx);
+        box-sizing: border-box;
+        border-radius: 10rpx;
+        border:solid 1rpx #d2d2d2;
+        margin: 10rpx;
+        padding: 10rpx 30rpx;
+        display: flex;
+        height: 100rpx;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 28rpx;
+    }
+    
+    /* 套餐类型 */
+    .combo{
+        background: white;
+        padding: 30rpx 50rpx;
+    }
+    
+    .combo-title{
+        font-size: 26rpx;
+        color: #910000;
+    }
+    
+    .combo-tabs{
+        margin: 0 -10rpx;
+        padding-top: 20rpx;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    
+    .combo-item{
+        margin: 10rpx;
+        width: calc(50% - 20rpx);
+        box-sizing: border-box;
+    }
+    
+    .combo-item.show > .combo-item-header{
+        background: white;
+        box-shadow: 3rpx 0 4rpx 4rpx rgba(255, 152, 0, .13);
+    }
+    
+    .combo-item-header{
+        background: #fffbf4;
+        border:solid 1rpx #e3a03a;
+        border-bottom: none;
+        border-radius: 20rpx 20rpx 0 0;
+        text-align: center;
+        padding: 20rpx;
+    }
+    
+    .combo-item-title{
+        font-size: 28rpx;
+        color: #2d2d2d;
+    }
+    
+    .combo-item-price{
+        font-weight: bold;
+        font-size: 48rpx;
+        color: #e3a03a;
+    }
+    
+    .combo-item-info{
+        background: #9e652a;
+        border-radius: 0 0 20rpx 20rpx;
+        font-size: 24rpx;
+        text-align: center;
+        color: white;
+        overflow: hidden;
+        image{
+            width: 100%;
+        }
+    }
+    
+    /* 预约表单 */
+    .combo-from{
+        display: block;
+        padding: 30rpx 50rpx;
+        border-top: solid 20rpx #e8e8e8;
+        background: white;
+    }
+    
+    .from-title{
+        font-size: 34rpx;
+    }
+    
+    .from-submit{
+        padding: 10rpx 0;
+        font-size: 26rpx;
+        color: #910000;
+    }
+    
+    .from-input{
+        background: #e2e2e2;
+        height: 90rpx;
+        border-radius: 40rpx;
+        margin-top: 30rpx;
+        padding: 0 30rpx;
+    }
+    
+    .from-button[size="default"]{
+        background: #252f4b;
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0;
+        margin-top: 30rpx;
+        font-weight: normal;
+        color: white;
+        border-radius: 40rpx;
+    }
+    
+    /* 客服电话 */
+    .service{
+        padding: 60rpx;
+        text-align: center;
+        background: #e8e8e8;
+        font-size: 28rpx;
+    }
+    
+    .callPhone{
+        color: #252f4b;
+    }
+</style>
diff --git a/pages/switchcity/switchcity.vue b/pages/switchcity/switchcity.vue
new file mode 100644
index 0000000..b979730
--- /dev/null
+++ b/pages/switchcity/switchcity.vue
@@ -0,0 +1,281 @@
+<template>
+    <view>
+        <view class="newLetter">
+            <text>黑龙江省</text>
+            <text>{{ address.cityName }}</text>
+            <text class="active">{{ address.districtName ? address.districtName : '请选择区域' }}</text>
+        </view>
+        
+        <!-- 市级选择 -->
+        <scroll-view class="scrollLeft" scroll-y="true" :scroll-into-view="scrollTopId"
+            :scroll-top="scrollTop">
+            <view class="selection" :class="{active : address.cityCode == item.code}" v-for="(item,index) in cityList" :key="index" @click="bindCity(item.code, item.name)">
+                <view class="item_city">
+                    {{ item.name }}<image class="checkImg" :class="{active : address.cityCode == item.code}" src="/static/icon/Check.png"></image>
+                </view>
+            </view>
+        </scroll-view>
+        
+        <!-- 区域选择 -->
+        <view class="region">
+            <scroll-view scroll-y="true" :scroll-into-view="scrollTopId" :scroll-top="scrollTop">
+                <view class="selection" :class="{active : address.provinceCode == item.code}" v-for="(item,index) in regiList" :key="index" @click="regionOpt(item.name)">
+                    <view class="item_city">
+                        {{ item.name }}<image class="checkImg" :class="{active : address.provinceCode == item.code}" src="/static/icon/Check.png"></image>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import QQMapWX from '@/utils/qqmap-wx-jssdk.min.js'
+    import { newCity, newidxCity } from '@/apis/interfaces/index'
+    export default {
+    	data() {
+    		return {
+                scrollTop   : 0,    // 置顶高度
+                scrollTopId : '',   // 置顶id
+                winHeight   : 0,    //可视高度
+                location: {
+                    defaultcity: '', // 定位区域名称
+                    defaultregi: ''  // 区域名称
+                },
+                address : {
+                    cityName       : "",  // 市名称
+                    districtName   : "",  // 区名称
+                    cityCode       : "",  // 市编号
+                    provinceCode   : ""   // 区编号
+                },
+                cityList     : [],   // 城市列表
+                regiList     : [],    //区域列表
+                qqMap: new QQMapWX({
+                    key: '4KYBZ-LCAKF-QWOJN-NIDNZ-FZHLZ-2XFW7',
+                    vm: this
+                }),
+            }
+        },
+        onLoad(e) {
+            // 获取定位 - 使用腾讯地图sdk
+            uni.getLocation({
+                success: res => {
+                    // 调用接口
+                    this.qqMap.reverseGeocoder({
+                        location: {
+                            latitude: res.latitude,
+                            longitude: res.longitude
+                        },
+                        success: locatRes => {
+                            if(res.message == "query ok"){
+                                this.location.defaultcity = locatRes.result.ad_info.city
+                                this.location.defaultregi = locatRes.result.ad_info.district
+                            }else{
+                                uni.showToast({
+                                    title: res.message,
+                                    icon : 'none'
+                                })
+                            }
+                        },
+                        fail: res => {},
+                        complete: res => {}
+                    });
+                }
+            })
+            if(e.area == '' ) e.area_code = '0'
+            this.address.cityName      = e.city
+            this.address.districtName  = e.area
+            this.address.cityCode      = e.city_code
+            this.address.provinceCode  = e.area_code
+            
+            // 获取全部城市
+            this.local();
+        },
+        onShow() {
+        },
+        methods:{
+            // 全部城市
+            local() {
+                newCity().then(res => {
+                    this.cityList = res
+                    // 获取区级列表
+                    this.regilist(this.address.cityCode)
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            },
+            
+            // 地区列表
+            regilist(areaCode) {
+                newidxCity({
+                    code: areaCode
+                }).then(res=>{
+                    res.unshift({ code: '0', name:'全部'})
+                    this.regiList = res
+                })
+            },
+            
+            // 选择城市
+            bindCity(code, name) {
+                this.address.cityCode = code,
+                this.address.cityName = name
+                // 获取区级列表
+                this.regilist(code)
+            },
+            
+            // 选择市区返回
+            regionOpt (name) {
+                let pages = getCurrentPages()
+                let nowPage = pages[ pages.length - 1]   // 当前页页面实例
+                let prevPage = pages[ pages.length - 2 ] // 上一页页面实例
+                prevPage.$vm.address.cityName = name     // 修改上一页data里面的brandName参数值为 item.name
+                uni.navigateBack({
+                    delta: 1
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    // 省份
+    .newLetter {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 90rpx;
+        line-height: 90rpx;
+        background-color: #fff;
+        z-index: 1001;
+        font-size: 28rpx;
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        &::before {
+            position: absolute;
+            content: '';
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            height: 2rpx;
+            background: #f1f1f1;
+        }
+        &::after {
+            position: absolute;
+            content: '';
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 2rpx;
+            background: #f1f1f1;
+        }
+        text {
+            display: inline-block;
+            position: relative;
+            margin-right: 20rpx;
+            padding: 0 10rpx;
+            &.active {
+                color: #e83339;
+            }
+            &.active::before {
+                position: absolute;
+                content: '';
+                left: 0;
+                bottom: -2rpx;
+                width: 100%;
+                height: 4rpx;
+                background: #e83339;
+            }
+        }
+    }
+    
+    // 市级选择
+    .scrollLeft {
+        position: fixed;
+        top: 90rpx;
+        height: calc(100% - 178rpx);
+        left: 0;
+        width: 260rpx;
+        z-index: 1001;
+        border-right: 1rpx solid #f1f1f1;
+        background-color: #fff;
+        .selection {
+            display: flex;
+            width: 100%;
+            flex-direction: column;
+            .item_city {
+                position: relative;
+                display: flex;
+                height: 100rpx;
+                padding-left: 34rpx;
+                align-items: center;
+                border-bottom: 1rpx solid #eaeaea;
+                font-size: 26rpx;
+                color: #666;
+                .checkImg {
+                    width: 28rpx;
+                    height: 28rpx;
+                    position: absolute;
+                    right: 20rpx;
+                    top: 38rpx;
+                    display: none;
+                    &.active {
+                        display: block;
+                    }
+                }
+            }
+            &.active .item_city {
+                color: #e83339;
+            }
+        }
+    }
+    
+    // 区域选择
+    .region {
+        position: fixed;
+        z-index: 1000;
+        left: 0;
+        top: 90rpx;
+        width: 100%;
+        height: calc(100% - 178rpx);
+        padding-left: 280rpx;
+        box-sizing: border-box;
+        background: #f5f5f5;
+        .selection {
+            display: flex;
+            width: 100%;
+            flex-direction: column;
+            .item_city {
+                padding: 0 0 0 20rpx;
+                box-sizing: border-box;
+                font-weight: normal;
+                font-size: 24rpx;
+                height: 102rpx;
+                position: relative;
+                display: flex;
+                padding-left: 34rpx;
+                align-items: center;
+                border-bottom: 1rpx solid #eaeaea;
+                font-size: 26rpx;
+                color: #666;
+                .checkImg {
+                    width: 28rpx;
+                    height: 28rpx;
+                    position: absolute;
+                    right: 20rpx;
+                    top: 38rpx;
+                    display: none;
+                    &.active {
+                        display: block;
+                    }
+                }
+            }
+            &.active .item_city {
+                color: #e83339;
+            }
+        }
+    }
+</style>
diff --git a/pages/unicom/buy.vue b/pages/unicom/buy.vue
new file mode 100644
index 0000000..4196730
--- /dev/null
+++ b/pages/unicom/buy.vue
@@ -0,0 +1,664 @@
+<template>
+    <view>
+        <!-- 按钮 -->
+        <view class="newrightsBtn" @tap="payment">
+        	<view class="rightsBtn-text"></view>
+        	<button :disabled="disabled">立即兑换</button>
+        </view>
+        
+        <!-- 卡券 -->
+        <view style="padding-bottom: 90px">
+            <view class="cont">
+                <view class="contBack">
+                    <image class="classBack" src="/static/img/unicom_back.png" mode="scaleToFill"></image>
+                    <view class="classCircle"></view>
+                    <view class="rightsCont">
+                        <scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+                            <view class="welfareCont-list-img" v-for="(item, index) in rightData.detail.logos" :key="index">
+                                <image src="/static/img/unicom_logo.png" mode="aspectFill"></image>
+                            </view>
+                        </scroll-view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" :src="rightData.detail.goods_cover" mode="widthFix"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ rightData.detail.five_title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"></view>
+                        <view class="rightsAdd">
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : rightData.num != 1}" @click="goodsNumber('remove')">-</view>
+                            <input class="rightsAdd-input" :data-num="rightData.num" :value="rightData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus" :class="{active : rightData.num != 1}">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 收货地址 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                    <block v-if="rightData.detail.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="/static/img/new_rightsAddress.png"></image>
+                            <block v-if="rightData.addressSee != ''">
+                                <view class="rightsLabel-right" @tap="addressTap">
+                                    <view class="rightsLabel-address-text">
+                                        <view class="rightsLabel-address-name">{{ rightData.addressSee.name }}<view class="rightsLabel-address-tel">{{ rightData.addressSee.mobile }}</view></view>
+                                        <text class="nowrap">{{ rightData.addressSee.all_address }}</text>
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </view>
+                            </block>
+                            <block v-else>
+                                <navigator class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                    <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                        添加收货地址
+                                    </view>
+                                    <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                                </navigator>
+                            </block>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right rightsLabel-freight">￥{{ rightData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <!-- <view class="noticeText-top">购买须知</view> -->
+                    <view class="noticeText-cont" v-if="notice.remark">
+                        <rich-text :nodes="notice.remark"></rich-text>
+                    </view>
+                    
+                    <!-- <view class="noticeText-top">内容介绍</view> -->
+                    <view class="noticeText-cont" v-if="notice.content">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { buy, buySubmit } from '@/apis/interfaces/unicom'
+    export default {
+        data() {
+            return {
+                rightData: {
+                    detail      : '',  // 权益内容
+                    rightId     : '',  // 权益id
+                    addressSee  : '',  // 收货地址
+                    num         : 1,   // 购买数量
+                    moreAmount  : '',  // 产品总金额
+                    freight     : '',  // 运费
+                    total       : ''   // 总金额
+                },
+                notice          : {
+                    remark      : '',     // 购买须知
+                    content     : '',     // 内容介绍
+                    noticeShow  : true   // 购买须知状态
+                },
+                buyWay          : {
+                    platformCp  : [],  // 选择提交数组
+                    platIndex   : 0,   // 选择提交方式下标
+                    isdeliver   : -1   // 选择提交方式
+                },
+                address         : {
+                    allAddress  : [],      // 收货地址列表
+                    addressShow : false    // 地址显示状态
+                },
+                disabled        : false,   //购买按钮状态
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            this.rightData.rightId = options.id
+            // this.code    = options.code || ''
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中石油活动
+            getApp().globalData.envType = 'unicomEnv'
+            
+            // 获取详情
+            this.rightsInfo();
+        },
+        methods: {
+            // 详情
+            rightsInfo() {
+                buy({activity_unicom_id: this.rightData.rightId, qty: this.rightData.num}).then(res => {
+                    console.log(res)
+                    let obj    = res.detail.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.def_get
+                        }
+                        if(res.detail.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.rightData.detail     = res.detail
+                    this.rightData.moreAmount = res.amount
+                    this.rightData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.rightData.freight    = res.freight
+                    this.rightData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.rightData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.rightData.num = num
+                    
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收银台跳转
+            payment() {
+                if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.rightData.detail.def_get
+                    
+                buySubmit({activity_unicom_id: this.rightData.rightId, qty: this.rightData.num, is_deliver: this.buyWay.isdeliver}).then(res => {
+                    uni.navigateTo({
+                        url: '/pages/cashier/index?tradeNo=' + res.trade_no + '&type=unicom' + "&activity_type=right" + '&price=' + this.rightData.moreAmount
+                    })
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+            
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #FFFFFF;
+    }
+    
+    /* 权益内容 */
+    .cont {
+        width: 100%;
+        overflow: hidden;
+        .contBack {
+            position: relative;
+            width: 200%;
+            height: 340rpx;
+            left: -50%;
+            text-align: center;
+            background: #000000;
+            border-radius: 0 0 100% 100%;
+            overflow: hidden;
+            .classBack {
+                position: absolute;
+                left: 28%;
+                right: 30%;
+                width: 44%;
+                top: 40rpx;
+            }
+        }
+        .classCircle::after,
+        .contBack::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+        }
+        .classCircle::after {
+            left: 20%;
+            top: -20rpx;
+            width: 260rpx;
+            height: 260rpx;
+        }
+        .contBack::before {
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .welfareCont-top{
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                height: 160rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 160rpx;
+                    height: 160rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 40rpx;
+        box-sizing: border-box;
+        .rightsGoods-img {
+            width: 300rpx;
+            height: 120rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 40rpx 40rpx 0 370rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                font-size: 36rpx;
+                margin-bottom: 35rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 地址
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 40rpx;
+        color: #6c6c6c;
+        font-weight: 600;
+        font-size: 30rpx;
+    }
+    
+    .rightsLabel-left {
+        flex: 1;
+        color: #747d86;
+        .rightsLabel-row {
+            width: 42rpx;
+            height: 42rpx;
+        }
+    }
+    
+    .rightsLabel-range {
+        display: flex;
+        color: #000;
+        font-weight: 600;
+    }
+    
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+        &::after,
+        &::before {
+            position: absolute;
+            content: '';
+            left: 30rpx;
+            width: calc(100% - 60rpx);
+            height: 2rpx;
+            background-color: #bfbfbf;
+        }
+        &::after {
+            top: 0;
+        }
+        &::before {
+            bottom: 0;
+        }
+        .rightsLabel-row {
+            margin-top: 30rpx;
+        }
+        
+        .rightsLabel-icon {
+            width: 70rpx;
+            height: 70rpx;
+            margin-top: 14rpx;
+        }
+        .rightsLabel-right {
+            width: calc(100% - 80rpx);
+            margin-left: 10rpx;
+            display: flex;
+            font-size: 28rpx;
+            .rightsLabel-address-text {
+                flex: 1;
+                color: #000000;
+                .rightsLabel-address-name {
+                    display: flex;
+                    font-size: 32rpx;
+                    margin-bottom: 10rpx;
+                    .rightsLabel-address-tel {
+                        padding-left: 30rpx;
+                        color: #959595;
+                    }
+                }
+            }
+        }
+    }
+    .rightsLabel-row {
+        width: 42rpx;
+        height: 42rpx;
+        margin: 0 0 0 6rpx;
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        border-top: 20rpx #eeeeee solid;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/unicom/details.vue b/pages/unicom/details.vue
new file mode 100644
index 0000000..78f7511
--- /dev/null
+++ b/pages/unicom/details.vue
@@ -0,0 +1,539 @@
+<template>
+    <view>
+        <!-- 卡券详情 -->
+        <view class="details">
+        	<view class="detailsTop">
+        		<view class="detailsTop-name">
+        			{{ details.name }}
+        		</view>
+        		<view class="detailsTop-time">
+        			有效期： {{ details.startTime }} - {{ details.endTime }}
+        		</view>
+        	</view>
+        	<view class="detailsCotent">
+        	    <view class="source">活动来源 ： {{ details.activity_name }}</view>
+        	    <view class="detailsBar">
+        	    	<view class="detailsCode-text">劵码</view>
+        	    	<image :src="barcode" mode="widthFix"></image>
+        	    </view>
+        	    <view class="detailsCode-text">
+        	    	{{ details.code }}
+        	    </view>
+        	    <view class="detailsCode">
+        	    	<image :src="qrcode"></image>
+        	    	<view class="detailsCode-text">
+        	    		<text>请出示以上券码给网点工作人员</text>
+        	    	</view>
+        	    </view>
+                
+                <!-- 门店定位 -->
+                <view class="detailsStore">
+                	<view class="detailsStore-top">
+                		<view class="detailsStore-title">
+                			适用门店
+                		</view>
+                		<navigator class="detailsStore-row" hover-class="none" :url="'/pages/store/index?id=' + details.id + '&type=campus'" v-if="longitude != 0 && latitude != 0">
+                			查看所有
+                			<image src="/static/icon/arrow_left.png"></image>
+                		</navigator>
+                	</view>
+                	<view class="location" v-if="longitude == 0 && latitude == 0">
+                		<image class="location-img" src="/static/img/location_img.jpg"></image>
+                		<text>您尚未授权本时生活开启定位服务</text>
+                		<text>不能看到附近的商家哦，点击下方按钮开启</text>
+                		<button class="location-btn" size="mini" open-type="openSetting">
+                			开启定位服务
+                		</button>
+                	</view>
+                	<view v-else>
+                		<block v-if="stores.length > 0">
+                			<view class="detailsStore-list" :data-id="(item.store_id)" v-for="(item, index) in stores" :key="index"
+                				@tap="detailsTap">
+                				<image :src="item.cover" class="detailsStore-logo"></image>
+                				<view class="detailsStore-cont">
+                					<view class="detailsStore-left">
+                						<view class="nowrap detailsStore-name">
+                							{{ item.title }}
+                						</view>
+                						<view class="detailsStore-place">
+                							<text class="nowrap">{{ item.address }}</text>
+                							{{ item.km }}
+                						</view>
+                					</view>
+                					<image class="detailsStore-tel" src="/static/icon/tel.png" @tap.stop="tel"
+                						:data-tel="(item.mobile)"></image>
+                				</view>
+                			</view>
+                		</block>
+                		<block v-else>
+                			<view class="pages-hint">
+                				<image src="/static/img/null_icon.png"></image>
+                				<view>暂无门店</view>
+                			</view>
+                		</block>
+                	</view>
+                </view>
+        	</view>
+            <!-- 使用须知 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		使用须知
+            	</view>
+            	<view class="detailsText-tips">
+            		<rich-text :nodes="remark"></rich-text>
+            	</view>
+            </view>
+            
+            <!-- 内容介绍 -->
+            <view class="detailsText">
+            	<view class="detailsText-title">
+            		内容介绍
+            	</view>
+            	<view class="detailsText-tips" v-if="content != null">
+            		<rich-text :nodes="content"></rich-text>
+            	</view>
+            </view>
+        </view>
+        
+        <!-- 底部 -->
+        <view class="detailsBottom">
+            <image src="/static/img/campus_details_back.png" mode="aspectFill"></image>
+            <view class="detailsBottom-cont">
+                <view class="detailsBottom-title">
+                    中石油活动
+                </view>
+                亿时代 - 本时生活
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { qrcode, barcode, couponinfo, merchantCard } from '@/apis/interfaces/campus'
+    export default {
+        data() {
+            return {
+                id          : 0,        //优惠券id
+                longitude   : 0,        //经度
+                latitude    : 0,        //纬度
+                details     : '',       //优惠券信息
+                stores      : [],       //商家列表
+                content     : '',       //内容介绍
+                remark      : '',       //使用须知
+                qrcode      : '',       //二维码
+                barcode     : '',       //条形码
+                merchantcardinfo:''     //商家券信息
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {
+            // 优惠券id
+            this.id = options.id
+    
+            // 获取二维码
+            qrcode(options.id).then(res=>{
+                this.qrcode = res.qrcode
+            })
+            
+            // 获取条形码
+            barcode(options.id).then(res=>{
+                this.barcode = res.barcode
+            })
+        },
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中国联通回馈活动
+            getApp().globalData.envType = 'unicomEnv'
+            
+            // 获取定位信息
+            uni.getLocation({
+                success: res => {
+                    this.latitude   = res.latitude
+                    this.longitude  = res.longitude
+                },
+                complete: () => {
+                    // 获取详情信息
+                    this.detailsInfo();
+                }
+            })
+        },
+        methods: {
+            // 详情信息
+            detailsInfo() {
+                couponinfo({
+                    coupon_id: this.id,
+                    user_lng: this.longitude,
+                    user_lat: this.latitude
+                }).then(res=>{
+                    let stores = res.stores
+                    stores.map(res=>{
+                        let distance = res.distance
+                        if(res.distance > 1000){
+                            distance = (distance / 1000) + "km"
+                        }else{
+                            distance = distance + "m"
+                        }
+                        res.km = distance
+                    })
+                    this.details = res.info
+                    this.stores  = stores
+                    this.remark  = res.info.right.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.content = res.info.right.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    //获取商家券信息
+                    if(res.info.card_type=='merchant_card'){
+                        this.getMerchantCardInfo()
+                    }
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 商家券信息
+            getMerchantCardInfo(){
+                merchantCard(this.id).then(res=>{
+                   this.merchantcardinfo  = res
+                }).catch(err => {
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 拨打电话
+            tel(e) {
+                let tel = e.currentTarget.dataset.tel
+                uni.showActionSheet({
+                    itemList    : ['呼叫商家电话'],
+                    success     : res =>{
+                        if(res.tapIndex==0){
+                            uni.makePhoneCall({
+                                phoneNumber: tel
+                            })
+                        }
+                    }
+                })
+            },
+            
+            // 查看门店详情页
+            detailsTap(e) {
+                let store_id     = e.currentTarget.dataset.id,
+                    user_lng     = this.longitude,
+                    user_lat     = this.latitude
+                uni.navigateTo({
+                    url: '/pages/store/details?store_id=' + store_id + '&user_lng=' +  user_lng  + '&user_lat=' + user_lat + '&type=campus'
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    page {
+        background-color: #e83241;
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    /* 卡券详情 */
+    .details {
+        background: #ffffff;
+        margin: 20rpx 20rpx 0;
+        width: calc(100% - 40rpx);
+        box-shadow: 0 0 20rpx rgba(0, 0,0, .1);
+        position: relative;
+        border-radius: 0 0 20rpx 20rpx;
+        border-bottom: 240rpx solid transparent;
+    }
+    
+    .details::after,
+    .details::before {
+        position: absolute;
+        background: #e83241;
+        content: '';
+        top: -50rpx;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+    }
+    
+    .details::after {
+        left: -50rpx;
+    }
+    
+    .details::before {
+        right: -50rpx;
+    }
+    
+    .detailsCotent {
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop {
+        border-bottom: 2rpx dashed #c8c8c8;
+        padding: 40rpx 0;
+        text-align: center;
+        background-color: #f5f5f5;
+    }
+    
+    .detailsTop-name {
+        font-size: 38rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        padding: 0 60rpx;
+        box-sizing: border-box;
+    }
+    
+    .detailsTop-time {
+        color: #7e7e7e;
+        font-size: 26rpx;
+    }
+    
+    .detailsCode {
+        text-align: center;
+        padding: 0 0 20rpx;
+        margin: 40rpx 0 30rpx;
+    }
+    
+    .detailsCode image {
+        width: 300rpx;
+        height: 300rpx;
+        margin-bottom: 30rpx;
+    }
+    
+    .detailsCode-text, .detailsStore-row {
+        color: #949494;
+        font-size: 28rpx;
+    }
+    
+    .detailsCode-text {
+        text-align: center;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #000;
+    }
+    
+    .detailsCode-text text {
+        color: #999;
+        font-weight: normal;
+        font-size: 26rpx;
+    }
+    
+    .detailsStore {
+        border-top: 2rpx #c8c8c8 solid;
+        padding-top: 40rpx;
+    }
+    
+    .detailsStore-top, .detailsStore-row {
+        display: flex;
+        line-height: 30rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsStore-title {
+        flex: 1;
+        font-weight: 600;
+    }
+    
+    .detailsStore-row image  {
+        width: 26rpx;
+        height: 26rpx;
+        margin: 3rpx 0 0 6rpx;
+    }
+    
+    .detailsStore-list {
+        position: relative;
+        margin-bottom: 40rpx;
+    }
+    
+    .detailsStore-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .detailsStore-logo {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 10rpx;
+    }
+    
+    .detailsStore-cont {
+        position: absolute;
+        left: 130rpx;
+        top: 0;
+        width: calc(100% - 130rpx);
+        display: flex;
+    }
+    
+    .detailsStore-left {
+        width: calc(100% - 90rpx);
+        margin-right: 30rpx;
+    }
+    
+    .detailsStore-tel {
+        width: 60rpx;
+        height: 60rpx;
+        margin-top: 25rpx;
+    }
+    
+    .detailsStore-place {
+        font-size: 24rpx;
+        line-height: 40rpx;
+        color: #5a5a5a;
+        display: flex;
+    }
+    
+    .detailsStore-place text {
+        flex: 1;
+        display: inline-block;
+        font-size: 28rpx;
+        margin-right: 20rpx;
+    }
+    
+    .detailsStore-name {
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText {
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+        border-top: 2rpx solid #ececec;
+    }
+    
+    .detailsText-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsText-tips {
+        font-size: 26rpx;
+        line-height: 50rpx;
+        color: #555557;
+        padding-bottom: 20rpx;
+    }
+    
+    .detailsCode-join {
+        color: #ee8e44;
+        font-size: 24rpx;
+        border-radius: 50rpx;
+        border: 2rpx solid #ee8e44;
+        padding: 10rpx 20rpx;
+        display: inline-block;
+        margin-top: 30rpx;
+    }
+    
+    .detailsCode-join.active {
+        border: 2rpx solid #999;
+        color: #999;
+    }
+    
+    .source{ 
+        margin: 30rpx 0;
+        font-size: 28rpx;
+    }
+    
+    .location {
+        background: white;
+        width: 100%;
+        text-align: center;
+        margin: 60rpx 0 0;
+    }
+    
+    .location text {
+        font-size: 28rpx;
+        display: block;
+        line-height: 46rpx;
+        color: #999;
+    }
+    
+    .location-btn[size="mini"] {
+        background-color: #ee8e44;
+        color: #fff;
+        font-size: 26rpx;
+        line-height: 66rpx;
+        margin-top: 30rpx;
+    }
+    
+    .location-img {
+        width: 150rpx;
+        height: 120rpx;
+        margin-bottom: 20rpx;
+    }
+    
+    .detailsBar {
+        text-align: center;
+        padding: 0 50rpx;
+        box-sizing: border-box;
+        margin-top: 60rpx;
+        margin-bottom: 40rpx;
+    }
+    
+    
+    .detailsBar image {
+        width: 100%;
+    }
+    
+    .detailsBar .detailsCode-text {
+        margin-bottom: 10px;
+        color: #000;
+    }
+    
+    .detailsBottom {
+        position: fixed;
+        width: 100%;
+        height: 220rpx;
+        left: 0;
+        bottom: 0;
+        z-index: 9;
+    }
+    .detailsBottom image {
+         width: 100%;
+         height: 100%;
+         position: absolute;
+         left: 0;
+         top: 0;
+    }
+    
+    .detailsBottom-cont {
+        z-index: 10;
+        position: absolute;
+        left: 0;
+        top: 70rpx;
+        width: 100%;
+        text-align: center;
+        color: #9a9a9a;
+        font-size: 26rpx;
+    }
+    
+    .detailsBottom-title {
+        font-weight: 600;
+        margin-bottom: 20rpx;
+        font-size: 30rpx;
+    }
+</style>
diff --git a/pages/unicom/index.vue b/pages/unicom/index.vue
new file mode 100644
index 0000000..de954e0
--- /dev/null
+++ b/pages/unicom/index.vue
@@ -0,0 +1,221 @@
+<template>
+    <view>
+        <image class="campusBanner" src="/static/img/unicomIdx_back.png" mode="widthFix"></image>
+        <view class="recommend">
+            <navigator hover-class="none" :url="'/pages/unicom/buy?id=' + item.advert_id" class="recommend-label" v-for="(item, index) in topData" :key="index">
+                <view class="recommend-label-img">
+                    <image :src="item.cover" mode="aspectFill"></image>
+                </view>
+                <view class="nowrap recommend-label-text">
+                    {{ item.title }}<text>{{ item.name }}</text>
+                </view>
+            </navigator>
+        </view>
+        
+        <!-- 中石油优惠券 -->
+        <view class="film">
+            <view class="filmTitle"></view>
+            <navigator hover-class="none" :url="'/pages/unicom/buy?id=' + item.activity_unicom_id" class="filmList" v-for="(item, index) in oilPetro" :key="index">
+                <view class="filmList-top">
+                    <view class="filmList-top-name">
+                        老用户回馈抽奖链接
+                    </view>
+                    <view class="filmList-top-price">
+        				<text>立即参与</text>
+                    </view>
+                </view>
+            </navigator>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/unicom'
+    export default {
+        data() {
+            return {
+                topData     : [],  // 头部推荐
+                oilMarket   : [],  // 中石油优惠券
+                oilPetro    : [],  // 超市购物券
+                adverts     : []
+            }
+        },
+        
+        // 生命周期函数--监听页面加载
+        onLoad(options) {},
+    
+        // 生命周期函数--监听页面显示
+        onShow() {
+            // 存储环境-中国联通回馈活动
+            getApp().globalData.envType = 'unicomEnv'
+            
+            // 获取首页数据
+            this.indexInfo();
+        },
+        methods: {
+            // 首页数据
+            indexInfo() {
+                index().then(res=>{
+                     this.oilPetro   = res.lists.cost
+                }).catch(err=>{
+                    if (!err.login) {
+                        uni.showModal({
+                            title: '用户登录已过期',
+                            content: '请重新登录',
+                            showCancel: false,
+                            success: res => {
+                                if (res.confirm) {
+                                    uni.redirectTo({
+                                        url: '/pages/unicom/signin'
+                                    });
+                                }
+                            }
+                        });
+                    }
+                })
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: '/pages/unicom/signin'
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        padding-bottom: 100rpx;
+        height: 100vh;
+    }
+    
+    // banner
+    .campusBanner {
+        width: 100%;
+    }
+    
+    // 推荐
+    .recommend {
+        overflow: hidden;
+        margin-top: -60rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        .recommend-label {
+            text-align: center;
+            width: calc(50% - 20rpx);
+            float: left;
+            margin: 0 10rpx 30rpx;
+            .recommend-label-img {
+                width: 150rpx;
+                height: 150rpx;
+                margin: 0 auto 10rpx;
+                background: linear-gradient(to bottom, #293350, #484e74);
+                box-shadow: 0px 8px 6px rgba(249,228,129,.5);
+                border-radius: 50%;
+                box-sizing: border-box;
+                image {
+                    width: 80rpx;
                    height: 80rpx;
+                    margin: 35rpx;
+                }
+            }
+            .recommend-label-text {
+                font-weight: 600;
+                text {
+                    display: block;
+                    font-size: 30rpx;
+                }
+            }
+        }
+    }
+    
+    // 列表
+    .film {
+        width: 100%;
+        padding: 10rpx 30rpx;
+        box-sizing: border-box;
+    }
+    .filmTitle {
+        background: linear-gradient(to right, #feefce, #fbe9c0, #e8d19b);
+        height: 80rpx;
+        line-height: 80rpx;
+        box-shadow: -4px 0 10px rgba(134,97,33,.2);
+        text-align: center;
+        border-radius: 10rpx 10rpx 0 0;
+        color: #a47d53;
+        font-weight: 600;
+        margin: 0 20rpx;
+    }
+    .filmList {
+        position: relative;
+        background: linear-gradient(to right, #494e75, #27314d);
+        box-shadow: 0px 6px 10px rgba(134,97,33,.5);
+        border-radius: 10rpx;
+        padding: 50rpx 30rpx 30rpx;
+        box-sizing: border-box;
+        margin-bottom: 20rpx;
+        overflow: hidden;
+        &:last-child {
+            margin-bottom: 0;
+        }
+        .filmList-tag {
+            transform: rotate(45deg);
+            position: absolute;
+            padding: 10px 0;
+            right: -33px;
+            top: -10px;
+            width: 150px;
+            background: red;
+            .filmList-tag-text {
+                position: absolute;
+                color: #FFFFFF;
+                right: 20px;
+                text-align: center;
+                top: 2px;
+                font-size: 12px;;
+                transform:rotate(-360deg);
+            }
+        }
+        .filmList-top {
+            display: flex;
+            margin-bottom: 10rpx;
+            .filmList-top-name {
+                width: calc(100% - 160rpx);
+                margin-right: 20rpx;
+                color: #fce2ae;
+                font-size: 48rpx;
+                line-height: 120rpx;
+            }
+            .filmList-top-price {
+				position: relative;
+                background: linear-gradient(to right, #d3ad68, #cda65f);
+                box-shadow: 0px 2px 10px rgba(249,228,129,.5);
+                width: 120rpx;
+                height: 120rpx;
+                border-radius: 50%;
+                color: #FFFFFF;
+                text-align: center;
+                padding-top: 20rpx;
+                font-size: 30rpx;
+                box-sizing: border-box;
+                text {
+                    display: block;
+                    word-wrap: break-word;
+                    word-break: break-all;
+                    width: 50%;
+                    margin: 0 auto;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/unicom/password.vue b/pages/unicom/password.vue
new file mode 100644
index 0000000..24f6a1c
--- /dev/null
+++ b/pages/unicom/password.vue
@@ -0,0 +1,231 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">身份验证</view>
+			</view>
+			<image class="cover" src="/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<button class="campus-form-btn" form-type="submit">设置新密码</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+		
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]||16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || ''
+					
+				auth({
+					mobile: mobileNo,
+					code: code,
+					type: 'reset_password'
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.redirectTo({
+						url: '/pages/unicom/setPassword'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/unicom/register.vue b/pages/unicom/register.vue
new file mode 100644
index 0000000..d6ef33b
--- /dev/null
+++ b/pages/unicom/register.vue
@@ -0,0 +1,238 @@
+<template>
+	<view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">用户注册</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+	    <view class="campus-cont">
+	        <form @submit="submitRegister">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue"
+				        name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code">
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请输入密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="请确认密码" name="password_confirmation"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">注册</button>
+	        </form>
+	    </view>
+	</view>
+</template>
+
+<script>
+    import { send, register } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+                disabled     : false,
+            }
+        },
+        methods: {
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                let mobileNo = this.mobileNo
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{
+						uni.showToast({
+						    title   : err.message,
+							icon	:'none',
+						    duration: 2000
+						})
+					})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            submitRegister(e){
+				let formValue = e.detail.value
+				
+				register({
+					mobile					: formValue.mobile,
+					password				: formValue.password,
+					password_confirmation	: formValue.password_confirmation,
+					code					: this.code,
+					parent_id				: 0
+				}).then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.showModal({
+						title		: "提示",
+						content		: "注册成功",
+						showCancel	: false,
+						confirmText : "确定",
+						success		: modalRes => {
+							if(modalRes.confirm){
+								uni.reLaunch({
+								    url: '/pages/unicom/index'
+								})
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/unicom/setPassword.vue b/pages/unicom/setPassword.vue
new file mode 100644
index 0000000..d44b7fc
--- /dev/null
+++ b/pages/unicom/setPassword.vue
@@ -0,0 +1,169 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">设置新密码</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="设置新的登录密码" name="password"></input>
+				</view>
+				<view class="campus-inputs">
+				    <input class="campus-form-input" type="password" placeholder="确认新的登录密码" name="newpassword"></input>
+				</view>
+				<button class="campus-form-btn" form-type="submit">找回</button>
+            </form>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { passSetup } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+            }
+        },
+        methods: {
+            // 立即登录
+            forgetlogin(e){
+                let newPass  = e.detail.value.newpassword || '',
+					password = e.detail.value.password || ''
+				
+				passSetup({
+					password: password,
+					password_confirmation: newPass
+				}).then(res => {
+					uni.showToast({
+						title: "密码重置成功",
+						icon : 'none'
+					})
+					uni.reLaunch({
+					    url: '/pages/unicom/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/unicom/signin.vue b/pages/unicom/signin.vue
new file mode 100644
index 0000000..0183016
--- /dev/null
+++ b/pages/unicom/signin.vue
@@ -0,0 +1,260 @@
+<template>
+    <view class="content">
+		<view class="campus-header">
+			<view class="logo">
+				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<view class="title">用户回馈活动登录</view>
+			</view>
+			<image class="cover" src="@/static/img/campusLogin_back_01.png" mode="aspectFill"></image>
+		</view>
+        <view class="campus-cont">
+            <form @submit="forgetlogin">
+				<view class="campus-inputs">
+				    <image class="campus-form-icon" src="/static/img/campus_login_02.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="number" placeholder="请输入手机号" @input="getNameValue" name="mobile"></input>
+				</view>
+				<view class="campus-inputs inputs-code" v-if="!passwordLogin">
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+					<input class="campus-form-input" type="number" placeholder="请输入验证码" @input="getCodeValue" maxlength="4"></input>
+					<button class="campus-form-code" @tap="getCode" :disabled="disabled" hover-class="none">{{ codename }}</button>
+				</view>
+				<view class="campus-inputs" v-else>
+				    <image class="campus-form-icon" src="/static/img/campus_login_03.png" mode="aspectFill"></image>
+				    <input class="campus-form-input" type="password" placeholder="请输入登录密码" name="password"></input>
+				</view>
+				<view class="resPassword">
+					<navigator url="./password">忘记密码</navigator>
+				</view>
+				<button class="campus-form-btn" form-type="submit">登录</button>
+            </form>
+			<view class="login-box">
+				<view @click="onCutLogin">{{passwordLogin ? '验证码登录': '密码登录'}}</view>
+				<navigator url="register">快速注册</navigator>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { send, auth, passlogin } from '@/apis/interfaces/auth'
+    export default {
+        data() {
+            return {
+                codename     : '获取验证码',
+                mobileNo     : '',   // 手机号
+                code         : '',   // 验证码
+				passwordLogin: true, // 登录方式
+                disabled     : false,
+            }
+        },
+        
+        methods: {
+			// 切换登录方式
+			onCutLogin(){
+				this.passwordLogin = !this.passwordLogin
+			},
+            // mobileNo
+            getNameValue(e) {
+                this.mobileNo = e.detail.value
+            },
+            
+            // 获取code
+            getCode(){
+                console.log('sss')
+                let mobileNo = this.mobileNo,
+                    myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9]|16[0-9])\d{8}$$/
+        
+                var _this    = this
+                if  (mobileNo == "") {
+                    uni.showToast({
+                        title     : '手机号不能为空',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else if (!myreg.test(mobileNo)) {
+                    uni.showToast({
+                        title     : '请输入正确的手机号',
+                        icon      : 'none',
+                        duration  : 1000
+                    })
+                    return false;
+                }else{
+                    send({mobile: mobileNo, channel: 'LOGIN'}).then(res=>{
+                        uni.showToast({
+                            title   : '发送成功',
+                            icon    : 'success',
+                            duration: 2000
+                        })
+                        var num = 61;
+                        var timer = setInterval(function () {
+                            num--;
+                            if (num <= 0) {
+                                clearInterval(timer);
+                                _this.codename  = '重新发送'
+                                _this.disabled  = false
+                    
+                            } else {
+                                _this.codename  = num + "s后重新获取"
+                                _this.disabled  = true
+                            }
+                        }, 1000)
+                    }).catch(err=>{})
+                }
+            },
+            
+            // 获取后输入code
+            getCodeValue (e) {
+                this.code = e.detail.value
+            },
+            
+            // 立即登录
+            forgetlogin(e){
+                let mobileNo = e.detail.value.mobile || '',
+                    code     = this.code || '',
+					password = e.detail.value.password || '',
+					loginFunction
+				
+				if(this.passwordLogin){
+					loginFunction = passlogin({
+						mobile	: mobileNo,
+						password: password
+					})
+				}else{
+					loginFunction = auth({
+						mobile: mobileNo,
+						code: code,
+						type: ''
+					})
+				}
+				
+				loginFunction.then(res => {
+					this.$store.commit('setToken', res.token)
+					uni.reLaunch({
+					    url: '/pages/unicom/index'
+					})
+				}).catch(err =>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		min-height: 100vh;
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	.campus-cont{
+		padding: 40rpx 60rpx;
+		.campus-inputs{
+			position: relative;
+			padding-left: 90rpx;
+			padding-right: 30rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 45rpx;
+			margin-bottom: 30rpx;
+			&.inputs-code{
+				padding-right: 280rpx;
+				.campus-form-code{
+					width: 260rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					background-color: transparent;
+					font-size: 30rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					color: white;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: white, $alpha: .5);
+					}
+				}
+			}
+		}
+		.campus-form-icon{
+			position: absolute;
+			left: 26rpx;
+			top: 26rpx;
+			width: 38rpx;
+			height: 38rpx;
+		}
+		.campus-form-input{
+			height: 90rpx;
+			color: white;
+			font-size: 32rpx;
+		}
+		
+		.resPassword{
+			text-align: right;
+			font-size: 28rpx;
+			navigator{
+				display: inline-block;
+			}
+		}
+		
+		.campus-form-btn{
+			margin-top: 100rpx;
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 45rpx;
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			font-size: 32rpx;
+			color: white;
+		}
+		.login-box{
+			display: flex;
+			justify-content: space-between;
+			font-size: 30rpx;
+			margin-top: 100rpx;
+			view{
+				color: #28314e;
+			}
+		}
+	}
+	.campus-header{
+		width: 100%;
+		padding-top: 70%;
+		position: relative;
+		.cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+		}
+		.logo{
+			position: absolute;
+			bottom: 80rpx;
+			width: 100%;
+			z-index: 2;
+			text-align: center;
+			image{
+				margin-top: 20%;
+				width: 160rpx;
+				height: 160rpx;
+				vertical-align: top;
+				margin-bottom: 30rpx;
+			}
+			.title{
+				font-weight: bold;
+				color: white;
+				font-size: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
new file mode 100644
index 0000000..8b1774c
--- /dev/null
+++ b/pages/user/index.vue
@@ -0,0 +1,474 @@
+<template>
+    <view>
+        <!-- 头部 -->
+        <view class="userHead" v-if="isUser">
+            <navigator hover-class="none" class="userHead-img" url="/pages/setUpForm/form_submit?type=avatar">
+                <image :src="userInfo.avatar" mode="aspectFill"></image>
+                <view class="userHead-edit">
+                    <text>编辑头像</text>
+                </view>
+            </navigator>
+            
+            <view class="userHead-text">
+                <view class="userHead-name" v-if="userInfo.identity">
+                    <view class="userHead-nickn">
+                        {{userInfo.nickname}}
+                    </view>
+                    <view class="userHead-tips default" v-if="userInfo.identity.identity_id == 0">
+                        {{ userInfo.identity.name }}
+                    </view>
+                    <view class="userHead-tips super" v-else-if="userInfo.identity.identity_id == 1">
+                        <image src="/static/img/user_identity_00.png"></image><text>{{ userInfo.identity.name }}</text>
+                    </view>
+                    <view class="userHead-tips sage" v-else>
+                        <image src="/static/img/user_identity_01.png"></image><text>{{ userInfo.identity.name }}</text>
+                    </view>
+                </view>
+                <view class="userHead-tel">
+                    {{userInfo.username}}
+                </view>
+            </view>
+        </view>
+        <view class="userHead" @click="userLogin" v-else>
+            <image class="userHead-img no-userHead" src="https://card.ysd-bs.com/storage/materials/2021/09/01/default_cover.png" mode="aspectFill"></image>
+            <view class="userHead-text">
+                <view class="userHead-login">
+                    去登录
+                </view>
+            </view>
+        </view>
+        
+        <!-- 我的会员卡 -->
+        <view class="userCard">
+        	<view class="userCard-title">我的会员卡</view>
+        	<view class="userCard-cont">
+        		<view class="userCard-clip">
+        			<swiper class="userCard-swiper" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration" :current="swiper.current">
+                        <swiper-item class="userCard-item" @click="swiperNav" :data-type="('silver')">
+                            <image class="userCard-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/user_card_00.png" mode="scaleToFill"></image>
+                            <view class="userCard-parice" style="color: #676869" v-if="isUser"><text>可用余额：</text>{{ userInfo.account.silver }}</view>
+                        </swiper-item>
+                        <swiper-item class="userCard-item" @click="swiperNav" :data-type="('drill')">
+                            <image class="userCard-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/user_card_02.png" mode="scaleToFill"></image>
+                            <view class="userCard-parice" style="color: #192b4c" v-if="isUser"><text>可用余额：</text>{{ userInfo.account.drill }}</view>
+                        </swiper-item>
+                        <swiper-item class="userCard-item" @click="swiperNav" :data-type="('balance')" v-if="userInfo.identity.identity_id != 0">
+                            <image class="userCard-img" src="https://card.ysd-bs.com/storage/materials/2021/09/01/user_card_01.png" mode="scaleToFill"></image>
+                            <view class="userCard-parice" style="color: #ff8f00" v-if="isUser"><text>可用余额：</text>{{ userInfo.account.balance }}</view>
+                        </swiper-item>
+        			</swiper>
+        		</view>
+        		<image src="/static/icon/arrow_left.png" class="userCard-arrow-left" @click="rightSee('nextImg')"></image>
+        		<image src="/static/icon/arrow_right.png" class="userCard-arrow-right" @click="rightSee('prevImg')"></image>
+        	</view>
+        	<view class="userCard-tips">
+        		滑动切换，查看更多权益
+        		<image src="/static/icon/arrow_tips.png"></image>
+        	</view>
+        </view>
+        
+        <!-- 我的服务 -->
+        <view class="userCard">
+        	<view class="userCard-title">我的服务</view>
+        	<view class="userOrder">
+        		<view class="userOrder-label" @click="userNav('/pages/coupon/coupon')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userCoupon.png"></image>
+        			</view>
+        			<text>我的卡券</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/packet/packet')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_06.png"></image>
+        			</view>
+        			<text>红包领取</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/site/index')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userSite.png"></image>
+        			</view>
+        			<text>收货地址</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/activate/activate')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_05.png"></image>
+        			</view>
+        			<text>实体卡激活</text>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 我的订单 -->
+        <view class="userCard">
+        	<view class="userCard-title">兑换订单</view>
+        	<view class="userOrder userOrder-label-new">
+        		<view class="userOrder-label" @click="userNav('/pages/order/order?orderType=welfareGoods')">
+        			<view class="userOrder-icon">
+        				<image src="/static/img/userOrder_00.png"></image>
+        			</view>
+        			<text>福利券订单</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/order/order?orderType=welfare')">
+        			<view class="userOrder-icon">
+        				<image src="/static/img/userOrder_01.png"></image>
+        			</view>
+        			<text>福利商品订单</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/order/order?orderType=rightsCoupons')">
+        			<view class="userOrder-icon">
+        				<image src="/static/img/userOrder_02.png"></image>
+        			</view>
+        			<text>权益券订单</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/order/order?orderType=rights')">
+        			<view class="userOrder-icon">
+        				<image src="/static/img/userOrder_03.png"></image>
+        			</view>
+        			<text>权益商品订单</text>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 我的工具 -->
+        <view class="userCard" v-if="isUser">
+        	<view class="userCard-title">我的工具</view>
+        	<view class="userOrder">
+        		<view class="userOrder-label" @click="userNav('/pages/userStored/index')" v-if="userInfo.identity.identity_id != 0">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_07.png"></image>
+        			</view>
+        			<text>储值分享</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/userGoods/index')" v-if="userInfo.identity.identity_id != 0">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_08.png"></image>
+        			</view>
+        			<text>产品分享</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/favour/favour')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_09.png"></image>
+        			</view>
+        			<text>红包赠予</text>
+        		</view>
+        		<view class="userOrder-label" @click="userNav('/pages/setUpForm/index')">
+        			<view class="userOrder-icon active">
+        				<image src="/static/img/userOrder_11.png"></image>
+        			</view>
+        			<text>个人设置</text>
+        		</view>
+        	</view>
+        </view>
+        
+    </view>
+</template>
+
+<script>
+    import { index } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                isUser: false,  // 用户是否登录
+    			// 卡轮播
+    			swiper: {
+    			    imgUrls: [
+    			        {
+    			            id      : 0,
+    			            src     : 'https://card.ysd-bs.com/storage/materials/2021/09/01/user_card_00.png',
+    			            color   : '#676869',
+    			            type    : 'silver'
+    			        },
+    			        {
+    			            id      : 2,
+    			            src     : 'https://card.ysd-bs.com/storage/materials/2021/09/01/user_card_02.png',
+    			            color   : '#192b4c',
+    			            type    : 'drill'
+    			        }
+    			    ],
+    			    autoplay: false,
+    			    interval: 5000,
+    			    duration: 1000,
+    			    current : 0
+    			},
+                userInfo: {
+                    avatar  : '',  // 用户头像
+                    identity: '',  // 用户身份
+                    nickname: '',  // 用户名称
+                    username: '',  // 用户手机号
+                    account : ''   // 用户会员卡信息
+                },
+                account: {
+                    
+                }
+    		}
+    	},
+        onLoad() {},
+        onShow() {
+            if(uni.getStorageSync("token")) {
+                this.isUser = true
+                // 获取用户登录信息
+                this.userData();
+            }
+        },
+        methods: {
+            // 用户登录后信息
+            userData() {
+                index().then(res => {
+                    // 是否设置过密码缓存
+                    uni.setStorage({
+                        key     : 'hasPaypass',
+                        data    : res.info.has_paypass
+                    })
+                    this.userInfo = res.info
+                    this.userInfo.order = res.order
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            },
+            
+            // 处理账户积分跳转
+            swiperNav(e) {
+                let newType = e.currentTarget.dataset.type
+                if(this.isUser){
+                    if(newType == "balance"){
+                        uni.navigateTo({
+                            url: '/pages/account/myBalance'
+                        })
+                        return
+                    }
+        
+                    uni.navigateTo({
+                        url: "/pages/account/account?type=" + newType
+                    })
+                }else{
+                    // 去登录
+                    uni.navigateTo({
+                        url: "/pages/auth/login"
+                    })
+                }
+            },
+            
+            // 处理未登录时的转跳
+            userNav(url){
+                let pageUrl = url
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: pageUrl
+                    })
+                    return
+                }
+                // 去登录
+                uni.navigateTo({
+                    url: "/pages/auth/login"
+                })
+            },
+            
+            // 右,左箭头
+            rightSee (e) {
+                var swiper = this.swiper;
+                var current = swiper.current;
+                if(e == 'nextImg') swiper.current = current < (swiper.imgUrls.length - 1) ? current + 1 : 0;
+                if(e == 'prevImg') swiper.current = current > 0 ? current - 1 : swiper.imgUrls.length - 1;
+                this.swiper = swiper
+            },
+            
+            // 用户登录
+            userLogin() {
+                uni.navigateTo({
+                    url: '/pages/auth/login'
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 头部 */
+    .userHead {
+        display: flex;
+        padding: 30rpx;
+        box-sizing: border-box;
+        background: white;
+        .userHead-img {
+            width: 135rpx;
+            height: 135rpx;
+            border-radius: 50%;
+            position: relative;
+            overflow: hidden;
+            image {
+                position: absolute;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+                border-radius: 50%;
+            }
+            .userHead-edit {
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                width: 100%;
+                text-align: center;
+                height: 48rpx;
+                line-height: 38rpx;
+                background-color: rgba(0,0,0,.5);
+                color: #fff;
+                text {
+                    display: inline-block;
+                    font-size: 24rpx;
+                    transform: scale(.9);
+                }
+            }
+        }
+        .userHead-text {
+            margin-left: 30rpx;
+            width: calc(100% - 160rpx);
+            .userHead-login {
+                border: 2rpx solid #313131;
+                border-radius: 6rpx;
+                font-size: 28rpx;
+                padding: 8rpx 30rpx;
+                margin-top: 40rpx;
+                display: inline-block;
+            }
+            .userHead-name {
+                margin: 20rpx 0;
+                font-size: 32rpx;
+                font-weight: 600;
+                display: flex;
+            }
+            .userHead-tips {
+                background: #c6c6c6;
+                border-radius: 30rpx;
+                color: #fff;
+                font-size: 24rpx;
+                padding: 0 15rpx;
+                height: 40rpx;
+                line-height: 40rpx;
+                text-align: center;
+                display: inline-block;
+                z-index: 99;
+                margin-left: 10rpx;
+                margin-top: 4rpx;
+                &.active {
+                    left: 8rpx;
+                    background: #000;
+                    color: #fff;
+                }
+                image {
+                    width: 24rpx;
+                    height: 24rpx;
+                    margin-right: 5rpx;
+                    vertical-align: -2rpx;
+                }
+                &.super,
+                &.sage {
+                    background: #000;
+                }
+            }
+        }
+    }
+    
+    // 我的会员卡
+    .userCard {
+        background: white;
+        padding-bottom: 30rpx;
+        margin-bottom: 20rpx;
+        .userCard-title {
+            font-size: 32rpx;
+            font-weight: 600;
+            padding: 30rpx 30rpx 0;
+            margin: 20rpx 0;
+        }
+        .userCard-cont {
+            padding:  30rpx 80rpx;
+            box-sizing: border-box;
+            position: relative;
+            .userCard-clip {
+                position: relative;
+                padding-top: 55%;
+                width: 100%;
+                .userCard-swiper {
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    z-index: 9;
+                    .userCard-item {
+                        padding: 0 10rpx;
+                        box-sizing: border-box;
+                        .userCard-img {
+                            width: 100%;
+                            height: 100%;
+                            background-size: 100% 100%;
+                        }
+                        .userCard-parice {
+                            position: absolute;
+                            z-index: 9;
+                            left: 30rpx;
+                            bottom: 50rpx;
+                            color: #f79210;
+                            font-weight: 600;
+                            font-size: 36rpx;
+                        }
+                    }
+                }
+            }
+            .userCard-arrow-left, .userCard-arrow-right {
+                width: 50rpx;
+                height: 50rpx;
+                position: absolute;
+                top: calc(50% - 25rpx);
+            }
+            .userCard-arrow-left {
+                right: 10rpx;
+            }
+            .userCard-arrow-right {
+                left: 10rpx;
+            }
+        }
+        .userCard-tips {
+            background: #f0f4fa;
+            border-radius: 30rpx;
+            width: 360rpx;
+            text-align: center;
+            margin: 0 auto;
+            color: #b4bbc4;
+            font-size: 26rpx;
+            padding: 14rpx 0;
+            image {
+                width: 20rpx;
+                height: 20rpx;
+            }
+        }
+    }
+    
+    // 我的服务
+    .userOrder {
+        overflow: hidden;
+        margin-top: 40rpx;
+        .userOrder-label {
+            float: left;
+            width: 25%;
+            text-align: center;
+            font-size: 28rpx;
+            .userOrder-icon {
+                width: 94rpx;
+                height: 94rpx;
+                background: #000;
+                border-radius: 50%;
+                padding: 18rpx;
+                box-sizing: border-box;
+                margin: 0 auto 10rpx;
+                image {
+                    width: 100%;
+                    height: 100%;
+                }
+            }
+        }
+    }
+</style>
diff --git a/pages/userGoods/goodsCode.vue b/pages/userGoods/goodsCode.vue
new file mode 100644
index 0000000..5200f02
--- /dev/null
+++ b/pages/userGoods/goodsCode.vue
@@ -0,0 +1,407 @@
+<template>
+    <view>
+        <view class="codeTitle">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userGoods_title.png" mode="widthFix"></image>
+        </view>
+        
+        <!-- 分享弹出 -->
+        <view class="goodsBack"></view>
+        <view class="goodsPop">
+            <view class="goodsTab">
+                <view class="goodsTab-label">产品海报</view>
+            </view>
+            <view class="goodsTitle">
+                <image src="/static/img/shareTitle.png" mode="aspectFill"></image>{{ profitText }}
+            </view>
+            <view class="goodsPoster">
+                <image @tap="bigPicture" :data-src="'pageDown'" :src="pageDown" mode="widthFix"></image>
+            </view>
+            <view class="goodsScroll-text">{{ pagedescrip }}</view>
+        
+            <view class="goodsTool">
+                <view class="codeShare-label" @tap="removeSaveImg">
+                    生成海报
+                </view>
+            </view>
+        </view>
+        
+        <!-- 海报canvas -->
+        <canvas class="canvasImg" canvas-id="qrcodeCard"></canvas>
+        
+        <!-- 图片弹出层 -->
+        <view class="user-lay sign-img-lay" v-if="isImgLay">
+            <view class="user-back">
+                <image class="user-back-img" :src="pageDown" mode="widthFix"></image>
+                <view class="user-back-cont">
+                    <image :src="qrcode" mode="aspectFill"></image>
+                </view>
+            </view>
+            <view class="longPress">长按图片保存二维码</view>
+            <button class="sign-img-btn remove-btn" size="mini" @tap="removeSaveImg">取消</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { publicCode, productPoster } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                qrcode      : '',    // 二维码
+                Picture     : 'https://lifetest.ysd-bs.com/storage/materials/2021/08/06/shareImg.jpg',   // 海报图片
+                rightId     : '',    // 产品id
+                userInfo    : '',    // 我的信息
+                isImgLay    : false, // 是否显示图片弹出层
+                parentId    : '',    // 是否分享进入
+                shareState  : false, // 显示分享朋友圈弹出层
+                pageDown    : '',    // 下载海报和展示海报
+                pageShare   : '',    // 分享好友朋友圈海报
+                profitText  : '',    // 奖励文字,
+                pagedescrip : ''     // 商品标题
+    		}
+    	},
+        onLoad(options) {
+            this.rightId  = options.rightid,
+            this.parentId = options.parent_id
+    
+            // 获取二维码
+            publicCode({
+                channel: 'h5',
+                type: 'goods',
+                url: 'pages/userGoods/goodsDet?rightid=' + options.rightid + '&type=shareGoods'
+            }).then(res=>{
+                this.qrcode   = res.qrcode
+                this.userInfo = res.user
+            }).catch(err=>{})
+            // 获取分享海报图
+            this.posterShow();
+        },
+        methods: {
+            // 分享海报图
+            posterShow(){
+                productPoster(this.rightId).then(res=>{
+                    this.pageDown   = res.cover
+                    this.pagedescrip= res.description
+                    this.pageShare  = res.wechat_cover
+                    this.profitText = res.profit_text
+                }).catch(err=>{})
+            },
+        
+            // 预览图片
+            bigPicture(e) { 
+                uni.previewImage({
+                    current : e.currentTarget.dataset.src,
+                    urls    : [e.currentTarget.dataset.src]
+                })
+            },
+        
+            // 绘图
+            dowImg(){
+                uni.showLoading({
+                    title: '加载中',
+                })
+        
+                let downImg = new Promise(success=>{
+                    uni.getImageInfo({
+                        src     : this.pageDown,
+                        success : res => {
+                            success(res.path)
+                        }
+                    })
+                })
+                
+                // 下载素材
+                let codeImg = new Promise(success => {
+                    wx.getImageInfo({
+                        src     : this.qrcode,
+                        success : res => {
+                            success(res.path)
+                        }
+                    })
+                })
+                
+                Promise.all([codeImg, avatarImg]).then(res => {
+                    // 绘制海报
+                    const ctx = uni.createCanvasContext('qrcodeCard')
+                    ctx.save()
+                    
+                    // 绘制背景
+                    ctx.drawImage(res[1], 0, 0, 375, 650)
+                    
+                    // 绘制白色背景
+                    ctx.drawImage('/static/img/goodsCode_white.png', 30, 460, 120, 120)
+                    
+                    // 绘制二维码
+                    ctx.drawImage(res[0], 40, 470, 100, 100)
+                    
+                    ctx.save();
+                    ctx.beginPath(); //开始绘制
+                    ctx.arc(70 / 2 + 156, 70 / 2 + 250, 70 / 2, 0, Math.PI * 2, false);
+                    ctx.clip();
+                    
+                    // 保存图片
+                    ctx.draw(true, () => {
+                        uni.hideLoading()
+                        uni.canvasToTempFilePath({
+                            canvasId: 'qrcodeCard',
+                            x: 0,
+                            y: 0,
+                            success: res => {
+                                this.qrcodeImg = res.tempFilePath
+                                this.removeSaveImg()
+                            }
+                        })
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: '海报下载，请检查网络',
+                        icon : 'none'
+                    })
+                })
+            },
+        
+            // 图片弹出层
+            removeSaveImg(){
+                this.isImgLay = !this.isImgLay
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .codeTitle {
+        width: 100%;
+        background-color: #222222;
+        border-radius: 0 0 300rpx 300rpx;
+        box-sizing: border-box;
+        padding: 30rpx 20rpx 0;
+        image {
+            text-align: center;
+            width: 100%;
+            border-radius: 20rpx;
+            display: block;
+        }
+    }
+    
+    
+    .goodsBack {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        background: rgba(0, 0, 0, .5);
+    }
+    
+    .goodsPop {
+        height: 84vh;
+        width: 100%;
+        background-color: #ffffff;
+        border-radius: 50rpx 50rpx 0 0;
+        left: 0;
+        bottom: 0;
+        position: fixed;
+    }
+    
+    .goodsTab {
+        display: flex;
+    }
+    
+    .goodsTab-label {
+        background-color: #dadada;
+        flex: 2;
+        text-align: center;
+        width: 50%;
+        line-height: 90rpx;
+        border-radius: 40rpx 40rpx 0 0;
+        &.active {
+            background-color: #ffffff;
+            border-radius: 40rpx 30rpx 0 0;
+            margin-top: -20rpx;
+            font-weight: 600;
+        }
+    }
+    
+    .goodsTitle {
+        background-color: #1f1f1f;
+        color: #eed4ae;
+        border-radius: 25rpx;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        margin: 30rpx;
+        position: relative;
+        image {
+            width: 46rpx;
+            height: 46rpx;
+            margin: 22rpx 20rpx 0 0;
+        }
+    }
+    
+    .goodsTitle::after {
+        position: absolute;
+        bottom: -10rpx;
+        left: calc(50% - 20rpx);
+        content: '';
+        width: 0;
+        height: 0;
+        border-left: 20rpx solid transparent;
+        border-right: 20rpx solid transparent;
+        border-top: 16rpx solid #1f1f1f;
+    }
+    
+    .goodsPoster {
+        text-align: center;
+        width: 100%;
+        height: 50vh;
+        overflow-y: scroll;
+        image {
+            width: 55%;
+            margin: 20rpx 0;
+        }
+    }
+    
+    .goodsScroll-text {
+        background-color: #ffffff;
+        position: absolute;
+        bottom: 160rpx;
+        left: 0;
+        width: 100%;
+        padding: 20rpx 40rpx;
+        box-sizing: border-box;
+        text-align: left;
+        font-size: 28rpx;
+    }
+    
+    .goodsTool {
+        display: flex;
+        position: absolute;
+        background-color: #ffffff;
+        width: 100%;
+        left: 0;
+        bottom: 0;
+        height: 160rpx;
+    }
+    
+    .codeShare-label {
+        width: calc(100% - 80rpx) !important;
+        margin: 30rpx 40rpx;
+        font-weight: normal;
+        text-align: center;
+        height: 86rpx;
+        line-height: 86rpx;
+        padding: 0;
+        border-radius: 10rpx;
+        font-size: 32rpx;
+        color: #ffffff;
+        background: linear-gradient(to left, #fe6d52, #fe8750);
+    }
+    
+    
+    /* 弹窗背景图 */
+    .user-lay {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-box-pack: center;
+        position: fixed;
+        background: rgba(0, 0, 0, .6);
+        height: 100vh;
+        width: 100vw;
+        top: 0;
+        left: 0;
+        z-index: 99;
+        box-sizing: border-box;
+    }
+    
+    /* 图片弹出层 */
+    .sign-img-lay {
+        text-align: center;
+    }
+    
+    .sign-img-src {
+        width: 70vw;
+        vertical-align: top;
+    }
+    
+    .sign-img-btn[size="mini"],
+    .longPress {
+        margin: 40rpx auto 0;
+        background: #ffffff;
+        font-weight: normal;
+        color: #2f3245;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0;
+        width: 80%;
+        border-radius: 10rpx;
+        font-size: 30rpx;
+    }
+    
+    .longPress{
+        position: relative;
+        &::after{
+            position: absolute;
+            content: '';
+            left: calc(50% - 10rpx);
+            top: -20rpx;
+            width: 0;
+            height: 0;
+            border-left: 20rpx solid transparent;
+            border-right: 20rpx solid transparent;
+            border-bottom: 20rpx solid #ffffff;
+        }
+    }
+    
+    .remove-btn[size="mini"] {
+        margin-top: 20rpx;
+        background: #f5d48f;
+        color: #000000;
+        font-weight: normal;
+    }
+    
+    /* 背景 */
+    .user-back-img {
+        width: 100%;
+        display: block;
+    }
+    
+    .user-back {
+        position: relative;
+        width: 80%;
+        text-align: center;
+        margin: 0 auto;
+    }
+    
+    .user-back-cont {
+        background: #ffffff;
+        padding: 20rpx;
+        border-radius: 10rpx;
+        box-sizing: border-box;
+        position: absolute;
+        bottom: 120rpx;
+        left: 40rpx;
+        image {
+            width: 160rpx;
+            height: 160rpx;
+        }
+    }
+    
+    .codeBack-yard-name {
+        width: 100%;
+        font-size: 26rpx;
+        text-align: center;
+    }
+    
+    /* canvas */
+    .canvasImg {
+        position: absolute;
+        left: -1000%;
+        bottom: 0;
+        height: 650px;
+        width: 375px;
+        background: #fbf6f0;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/userGoods/goodsDet.vue b/pages/userGoods/goodsDet.vue
new file mode 100644
index 0000000..6188245
--- /dev/null
+++ b/pages/userGoods/goodsDet.vue
@@ -0,0 +1,349 @@
+<template>
+    <view>
+        <!-- 轮播 -->
+        <view class="banner" v-if="productData.share">
+            <swiper class="swiperCont" interval="3000" autoplay circular @change="swiperChange">
+                <swiper-item v-for="(item, index) in productData.share.pictures" :key="index">
+                    <image class="swiperImg" :src="item" mode="aspectFill"></image>
+                </swiper-item>
+            </swiper>
+            <view class="swiperDot" v-if="productData.share.pictures.length > 0">
+                {{ current }}/{{ productData.share.pictures.length }}
+                </view>
+        </view>
+        
+        <!-- 权益介绍 -->
+        <view class="content">
+            <view class="contentText">
+                <view class="contentText-title">{{ productData.title }}</view>
+                <view class="contentText-text" v-if="productData.share">{{ productData.share.description }}</view>
+                <view class="contentText-price">
+                    <view class="contentText-price-primary"><text>￥</text>{{ productData.price }}</view>
+                    <view class="contentText-price-close" v-if="productData.share">门市价￥{{ productData.share.cost }}</view>
+                </view>
+            </view>
+            <view @tap="userNav" class="contentBuy">立即购买</view>
+        </view>
+        
+        <!-- 规格 -->
+        <view class="specs">
+            <view class="specs-label" v-if="productData.share">
+                <text>规格</text>
+                {{ productData.share.type_name }}
+            </view>
+            <view class="specs-label">
+                <text>门店</text>
+                <view class="specs-site">
+                    <view class="specs-site-list" v-for="(item, index) in productStores" :key="index">
+                        <view class="specs-site-name">{{ item.title }}</view>
+                        {{ item.address }}
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 规格 -->
+        <view class="imageText">
+            <view class="imageText-title">
+                图文详情
+            </view>
+            <view class="imageText-text" v-if="productContent">
+                <rich-text :nodes="productContent"></rich-text>
+            </view>
+            <view class="imageText-end">
+                END
+            </view>
+        </view>
+        
+        
+        <!-- 漂浮窗 -->
+        <movable-area class="indexFloat" v-if="canShare">
+            <movable-view y="400" direction="vertical" class="indexFloat-movable">
+                <navigator hover-class="none" :url="'/pages/userGoods/goodsCode?rightid=' + rightId"
+                    class="indexFloat-img">
+                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/index_float_01.png" mode="aspectFill"></image>
+                </navigator>
+            </movable-view>
+        </movable-area>
+    </view>
+</template>
+
+<script>
+    import { productInfo } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                isUser          : false, //用户登录状态
+                qrcode          : '',   //二维码
+                userInfo        : '',   //我的信息
+                current         : 1,    //产品轮播index
+                rightId         : '',   //产品id
+                parentId        : '',   //分享人id
+                productData     : '',   //详情数据
+                productStores   : [],   //门店列表
+                productContent  : '',   //图文详情
+                canShare        : ''    //分享按钮状态
+    		}
+    	},
+        onLoad(options) {
+            if(options.type){
+                getApp().globalData.shareObj = {
+                    type    : options.type,
+                    goodsId : options.rightid,
+                    userId  : options.parent_id
+                }
+            }
+    
+            this.rightId = options.rightid
+        },
+        onShow(){
+            // 获取产品详情
+            this.goodsShow();
+            this.isUser = getApp().globalData.isUser
+        },
+        methods: {
+            // 商品轮播
+            swiperChange(e) {
+                this.current = e.detail.current + 1
+            },
+        
+            // 产品详情
+            goodsShow(){
+                productInfo(this.rightId).then(res=>{
+                    this.canShare      = res.canShare
+                    this.productData   = res.info
+                    this.productStores = res.stores
+                    this.productContent= res.info.share.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                }).catch(err=>{})
+            },
+        
+            // 处理未登录时的转跳
+            userNav(){
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: '/pages/rights/index?id=' + this.productData.right_config_id + '&parent_id=' + this.parentId + '&type=share'
+                    })
+                } else {
+                    // 去登录
+                    uni.navigateTo({
+                        url: "/pages/auth/login?way=shareLogin"
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #f0f0f0;
+    }
+    
+    /* 轮播图 */
+    .banner {
+        width: 100%;
+        position: relative;
+        padding-top: 60%;
+    }
+    
+    .swiperCont, .swiperImg {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+    }
+    
+    .swiperDot {
+        position: absolute;
+        background: rgba(0, 0, 0, .5);
+        border-radius: 80rpx;
+        padding: 0 25rpx;
+        line-height: 46rpx;
+        z-index: 2;
+        bottom: 20rpx;
+        right: 50rpx;
+        color: #ffffff;
+    }
+    
+    /* 权益介绍 */
+    .content {
+        width: 100%;
+        padding: 25rpx;
+        box-sizing: border-box;
+        display: flex;
+    }
+    
+    .contentText {
+        width: calc(100% - 240rpx);
+        margin-right: 40rpx;
+    }
+    
+    .contentText-title {
+        font-weight: 600;
+        font-size: 36rpx;
+    }
+    
+    .contentText-text {
+        font-size: 26rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+        color: #646464;
+    }
+    
+    .contentText-price {
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        display: flex;
+    }
+    
+    .contentText-price-primary {
+        color: #f57400;
+        font-size: 48rpx;
+        font-weight: 600;
+        text {
+            font-size: 28rpx;
+        }
+    }
+    
+    .contentText-price-close {
+        font-size: 24rpx;
+        color: #646464;
+        margin: 20rpx 0 0 10rpx;
+        text-decoration: line-through;
+    }
+    
+    .contentBuy {
+        background: linear-gradient(to left, #fe6d52, #fe8750);
+        border-radius: 20rpx;
+        width: 200rpx;
+        text-align: center;
+        height: 70rpx;
+        line-height: 70rpx;
+        color: #ffffff;
+        margin-top: 70rpx;
+    }
+    
+    /* 规格 */
+    .specs {
+        background-color: #ffffff;
+        padding: 25rpx;
+        box-sizing: border-box;
+        margin: 0 20rpx;
+        border-radius: 20rpx;
+    }
+    
+    .specs-label {
+        display: flex;
+        margin-bottom: 30rpx;
+        text {
+            font-size: 30rpx;
+            display: block;
+            width: 100rpx;
+            color: #808080;
+            line-height: 44rpx;
+        }
+    }
+    
+    .specs-label:last-child {
+        margin-bottom: 0;
+    }
+    
+    .specs-site {
+        box-sizing: border-box;
+        font-size: 30rpx;
+        width: calc(100% - 120rpx);
+    }
+    
+    .specs-site-list {
+        margin-bottom: 20rpx;
+        font-size: 28rpx;
+    }
+    
+    .specs-site-list:last-child {
+        margin-bottom: 0;
+    }
+    
+    .specs-site-name {
+        font-size: 32rpx;
+        margin-bottom: 10rpx;
+    }
+    
+    /* 详情 */
+    .imageText {
+        width: 100%;
+        padding: 40rpx;
+        box-sizing: border-box;
+    }
+    
+    .imageText-title {
+        width: 200rpx;
+        margin: 0 auto 30rpx;
+        text-align: center;
+        position: relative;
+    }
+    
+    .imageText-title::after,
+    .imageText-title::before {
+        position: absolute;
+        content: '';
+        top: 49%;
+        background-color: #000000;
+        width: 100rpx;
+        height: 2rpx;
+    }
+    
+    .imageText-title::after {
+        left: -100rpx;
+    }
+    
+    .imageText-title::before {
+        right: -100rpx;
+    }
+    
+    .imageText-end {
+        width: 80rpx;
+        height: 80rpx;
+        margin: 30rpx auto;
+        line-height: 80rpx;
+        text-align: center;
+        border-radius: 50%;
+        border: 2rpx solid #000000;
+        position: relative;
+    }
+    
+    .imageText-end::after {
+        position: absolute;
+        content: '';
+        width: 10rpx;
+        height: 10rpx;
+        border-radius: 50%;
+        top: 0rpx;
+        right: 16rpx;
+        background-color: #000000;
+    }
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        height: 52%;
+        width: 130rpx;
+        right: 20rpx;
+        bottom: 40rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-movable {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 150rpx;
+        z-index: 99;
+        image {
+            width: 130rpx;
+            height: 130rpx;
+            margin-bottom: 20rpx;
+        }
+    }
+</style>
diff --git a/pages/userGoods/index.vue b/pages/userGoods/index.vue
new file mode 100644
index 0000000..310b399
--- /dev/null
+++ b/pages/userGoods/index.vue
@@ -0,0 +1,307 @@
+<template>
+    <view>
+        <view class="codeTitle">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userGoods_title.png" mode="widthFix"></image>
+        </view>
+        
+        <view class="shareCont">
+            <!-- 提示 -->
+            <view class="indexNews">
+                <image src="/static/icon/news_icon.png"></image>
+                <view class="marquee_container" style="--marqueeWidth--:-30em">
+                    <view class="marquee_text" :class="{active : noticeText.length > 20}">{{ noticeText }}</view>
+                </view>
+            </view>
+        
+            <!-- 列表 -->
+            <view class="goods" v-if="goodsArr.length > 0">
+                <view class='goodsList-half'>
+                    <navigator hover-class="none" v-for="(item, index) in goodsArr" :key="index" :url="'/pages/userGoods/goodsDet?rightid=' + item.right_config_id"
+                        class="goodsList" v-if="index%2 == 0">
+                        <view class="goodsList-img">
+                            <image :src="item.cover" mode="aspectFill"></image>
+                        </view>
+                        <view class="goodsList-cont">
+                            <view class="nowrap goodsList-name" v-if="item.share">[ {{ item.title }} ]{{ item.share.type_name }}</view>
+                            <view class="goodsList-text" v-if="item.share">{{ item.share.sub_title }}</view>
+                            <view class="goodsList-label" v-if="item.share"><text v-for="(items, index) in item.share.label" :key="index">{{ items }}</text></view>
+                            <view class="goodsList-tips" v-if="item.profit"><text>追加激励￥{{ item.profit.stimulate }}</text></view>
+                            <view class="goodsList-price">
+                                <view class="goodsList-price-number">￥{{ item.price }}<text v-if="item.share">￥{{ item.share.cost }}</text></view>
+                                <view class="goodsList-price-btn">
+                                    <image src="/static/img/userGoods_icon.png" v-if="item.profit"></image><text>返￥</text>{{ item.profit.value }}
+                                </view>
+                            </view>
+                        </view>
+                    </navigator>
+                </view>
+                <view class='goodsList-half'>
+                    <navigator hover-class="none" :url="'/pages/userGoods/goodsDet/goodsDet?rightid=' + item.right_config_id"
+                        class="goodsList" v-for="(item, index) in goodsArr" :key="index" v-if="index%2 != 0">
+                        <view class="goodsList-img">
+                            <image :src="item.cover" mode="aspectFill"></image>
+                        </view>
+                        <view class="goodsList-cont">
+                            <view class="nowrap goodsList-name">[ {{ item.title }} ]{{ item.share.type_name }}</view>
+                            <view class="goodsList-text">{{ item.share.sub_title }}</view>
+                            <view class="goodsList-label"><text v-for="(items, index) in item.share.label" :key="index">{{ items }}</text></view>
+                            <view class="goodsList-tips" v-if="item.profit"><text>追加激励￥{{ item.profit.stimulate }}</text></view>
+                            <view class="goodsList-price">
+                                <view class="goodsList-price-number">￥{{ item.price }}<text>￥{{ item.share.cost }}</text></view>
+                                <view class="goodsList-price-btn">
+                                    <image src="/static/img/userGoods_icon.png" v-if="item.profit"></image><text>返￥</text>{{ item.profit.value }}
+                                </view>
+                            </view>
+                        </view>
+                    </navigator>
+                </view>
+                <view class="pagesLoding" v-if="lodingStats">
+                    <block v-if="page.has_more">
+                        <image class="pagesLoding-icon" src="/static/icon/refresh_loding.gif" mode="widthFix"></image>加载中...
+                    </block>
+                    <block v-else>
+                        没有更多了~
+                    </block>
+                </view>
+            </view>
+        
+            <view class="pack-center pages-hint" v-else>
+                <image src="/static/img/staff_null.png"></image>
+                <view>暂无数据</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { productList } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                noticeText  : '',       // 公告
+                goodsArr    : [],       // 产品列表
+                page        : {},       // 下一页
+                lodingStats : false ,   // 加载状态
+    		}
+    	},
+        onLoad(options) {
+            // 获取产品列表
+            this.goodsGain();
+        },
+        methods: {
+            // 产品列表
+            goodsGain(page){
+                productList(page).then(res=>{
+                    let listArr = this.goodsArr,
+                         newData = []
+                     if(page == 1 || page == undefined) listArr = []
+                     newData = listArr.concat(res.list.data)
+                    this.goodsArr    = newData
+                    this.page        = res.list.page
+                    this.noticeText  = res.notice
+                    this.lodingStats = false
+                    uni.stopPullDownRefresh()
+                }).catch(err=>{})
+            },
+            
+            // 上拉加载
+            onReachBottom(){
+                this.lodingStats = true
+                let pageNumber = this.page.current
+                if(this.page.has_more){
+                    pageNumber++
+                    this.profitInfo(pageNumber)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #e4e4e4;
+    }
+    
+    .codeTitle {
+        width: 100%;
+        background-color: #222222;
+        border-radius: 0 0 300rpx 300rpx;
+        box-sizing: border-box;
+        padding: 30rpx 20rpx 0;
+        image {
+            text-align: center;
+            width: 100%;
+            border-radius: 20rpx;
+            display: block;
+        }
+    }
+    
+    .shareCont {
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        width: 100%;
+    }
+    
+    .indexNews {
+        background: #c4c4c4;
+        display: flex;
+        font-weight: 600;
+        line-height: 46rpx;
+        border-radius: 50rpx;
+        padding: 20rpx 30rpx;
+        box-sizing: border-box;
+        margin: 30rpx 0;
+        image {
+            width: 42rpx;
+            height: 42rpx;
+            margin: 4rpx 20rpx 0 0;
+        }
+    }
+    
+    .goods {
+        display: flex;
+        flex-direction: row;
+        margin: 0 -10rpx;
+    }
+    
+    .goodsList-half {
+        width: 50%;
+    }
+    
+    .goodsList {
+        margin: 0 10rpx 20rpx;
+        background-color: #ffffff;
+        border-radius: 20rpx;
+        overflow: hidden;
+    }
+    
+    .goodsList-img {
+        width: 100%;
+        position: relative;
+        padding-top: 80%;
+        image {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            left: 0;
+            top: 0;
+        }
+    }
+    
+    .goodsList-cont {
+        padding: 20rpx;
+        box-sizing: border-box;
+    }
+    
+    .goodsList-name {
+        font-weight: 600;
+    }
+    
+    .goodsList-text {
+        margin: 10rpx 0;
+        color: #6c6c6c;
+        font-size: 26rpx;
+        font-weight: 600;
+    }
+    
+    .goodsList-label text {
+        display: inline-block;
+        font-size: 20rpx;
+        background-color: #dedede;
+        border-radius: 4rpx;
+        padding: 6rpx 10rpx;
+        margin: 0 10rpx 5rpx 0;
+    }
+    
+    .goodsList-tips {
+        text-align: right;
+        margin: 30rpx 0 10rpx;
+        text {
+            background-color: #ff5c36;
+            transform: scale(.8);
+            color: #ffffff;
+            border-radius: 60rpx;
+            font-size: 22rpx;
+            padding: 2rpx 10rpx;
+        }
+    }
+    
+    .goodsList-price {
+        display: flex;
+    }
+    
+    .goodsList-price-number {
+        flex: 1;
+        line-height: 50rpx;
+    }
+    
+    .goodsList-price-btn {
+        background-color: #ff5c36;
+        height: 48rpx;
+        line-height: 48rpx;
+        border-radius: 10rpx;
+        color: #ffffff;
+        padding: 0 10rpx;
+        font-size: 26rpx;
+        font-weight: 600;
+        image {
+            width: 20rpx;
+            height: 20rpx;
+            margin: 0 10rpx 0 0;
+            vertical-align: -2rpx;
+        }
+        text {
+            font-size: 22rpx;
+        }
+    }
+    
+    .goodsList-price-number {
+        color: #ff5c36;
+        font-size: 32rpx;
+        font-weight: 600;
+        text {
+            font-size: 22rpx;
+            color: #8f8f8f;
+            font-weight: normal;
+            text-decoration:line-through;
+            padding-right: 10rpx;
+        }
+    }
+    
+    /* 滚动  */
+    /*首页跑马灯效果*/
+    @keyframes around {
+        from {
+            margin-left: 60rpx;
+        }
+    
+        to {
+            /* var接受传入的变量 */
+            margin-left: var(--marqueeWidth--);
+        }
+    }
+    
+    .marquee_container {
+        width: calc(100% - 40rpx);
+        overflow: hidden;
+    }
+    
+    .marquee_container:hover {
+        /* 不起作用 */
+        animation-play-state: paused;
+    }
+    
+    .marquee_text {
+        font-size: 30rpx;
+        display: inline-block;
+        white-space: nowrap;
+    }
+    
+    .marquee_text.active {
+        animation-name: around;
+        animation-duration: 20s;
+        /*过渡时间*/
+        animation-iteration-count: infinite;
+        animation-timing-function: linear;
+    }
+</style>
diff --git a/pages/userStored/index.vue b/pages/userStored/index.vue
new file mode 100644
index 0000000..34226cb
--- /dev/null
+++ b/pages/userStored/index.vue
@@ -0,0 +1,297 @@
+<template>
+    <view>
+        <block v-if="storedArr.length > 0">
+            <image class="userStoredBack" src="https://card.ysd-bs.com/storage/materials/2021/09/01/userStored_back.png" mode="widthFix"></image>
+            <view class="userStored">
+                <view class="userStoredCont">
+                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userStored_icon.png" class="userStoredCont-back"></image>
+                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userStored_text.png" class="userStoredCont-text"></image>
+                    <view class="userStoredCont-list">
+                        <view class="userStoredCont-label" v-for="(item, index) in storedArr" :key="index">
+                            <view class="userStoredCont-title">
+                                <text>{{ item.title }}</text>
+                                <view class="userStoredCont-title-tips">消费红包</view>
+                            </view>
+                            <view class="userStoredCont-brief">
+                                {{ item.text }}<text>（{{ item.qty }}张{{ item.worth }}元）</text>
+                            </view>
+                            <view class="userStoredCont-rights">
+                                <view class="userStoredCont-rights-left">
+                                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userStored_img_00.png" class="userStoredCont-fireworks"
+                                        mode="widthFix">
+                                    </image>
+                                    <view class="userStoredCont-tips">
+                                        <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/userStored_img_01.png" class="userStoredCont-rights-back"
+                                            mode="widthFix"></image>
+                                        <text>{{ item.coupon_name }}</text>
+                                    </view>
+                                    <view class="userStoredCont-price">
+                                        <text>￥{{ item.worth }}</text>(满{{ item.full }}减{{ item.worth }})
+                                    </view>
+                                </view>
+                                <view @tap="userNav(item.right_config_id)" class="userStoredCont-rights-btn">立即儲值</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </block>
+        <view class="pack-center pages-hint" v-else>
+            <image src="/static/img/staff_null.png"></image>
+            <view>暂无数据</view>
+        </view>
+        
+        <!-- 漂浮窗 -->
+        <movable-area class="indexFloat" v-if="canShare">
+            <movable-view y="400" direction="vertical" class="indexFloat-movable">
+                <navigator hover-class="none" url="/pages/userStored/storedCode" class="indexFloat-img">
+                    <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/index_float_01.png" mode="aspectFill"></image>
+                </navigator>
+            </movable-view>
+        </movable-area>
+    </view>
+</template>
+
+<script>
+    import { storedList } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                canShare    : '',   //分享按钮状态
+                storedArr   : [],   //储值权益列表,
+                parentId    : '',   //分享者id
+    		}
+    	},
+        onLoad(options) {
+            if(options.type){
+                getApp().globalData.shareObj = {
+                    type    : options.type,
+                    goodsId : '',
+                    userId  : options.parent_id
+                }
+            }
+        },
+        onShow(){
+            // 获取产品详情
+            this.storedShow();
+        },
+        methods: {
+            // 产品详情
+            storedShow(){
+                storedList().then(res=>{
+                    this.canShare  = res.canShare
+                    this.storedArr = res.list
+                }).catch(err=>{})
+            },
+        
+            // 处理未登录时的转跳
+            userNav(id){
+                if(uni.getStorageSync("token")) {
+                    uni.navigateTo({
+                        url: '/pages/rights/index?id=' + id + '&orderType=shareStored'
+                    })
+                } else {
+                    // 去登录
+                    uni.navigateTo({
+                        url: "/pages/auth/login?way=shareLogin"
+                    })
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .userStoredBack {
+        width: 100%;
+    }
+    
+    .userStored {
+        padding: 0 30rpx;
+        box-sizing: border-box;
+    }
+    
+    .userStoredCont {
+        background: linear-gradient(to bottom, #e3d6c4, #bca585);
+        border-radius: 20rpx;
+        position: relative;
+        margin-top: -220rpx;
+        height: 1020rpx;
+        padding: 20rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .userStoredCont-back,
+    .userStoredCont-text {
+        position: absolute;
+    }
+    
+    .userStoredCont-back {
+        width: 70%;
+        right: 0;
+        top: 0;
+    }
+    
+    .userStoredCont-text {
+        width: 420rpx;
+        height: 192rpx;
+        left: 20rpx;
+        top: 40rpx;
+        z-index: 1;
+    }
+    
+    .userStoredCont-list {
+        background-color: #fefbf4;
+        border-radius: 20rpx;
+        position: absolute;
+        top: 260rpx;
+        left: 30rpx;
+        right: 30rpx;
+        width: calc(100% - 60rpx);
+        padding: 30rpx 30rpx 0;
+        box-sizing: border-box;
+    }
+    
+    .userStoredCont-label {
+        margin-bottom: 30rpx;
+        padding-bottom: 40rpx;
+        height: 300rpx;
+        border-bottom: #e8bd94 solid 2rpx;
+    }
+    
+    .userStoredCont-label:last-child {
+        border: none;
+    }
+    
+    .userStoredCont-title {
+        display: flex;
+        text {
+            font-size: 48rpx;
+            color: #806136;
+        }
+    }
+
+    .userStoredCont-title-tips {
+        background-color: #fb5734;
+        color: #ffffff;
+        border-radius: 80rpx;
+        font-size: 28rpx;
+        height: 42rpx;
+        line-height: 42rpx;
+        margin: 17rpx 0 0 20rpx;
+        padding: 0 15rpx;
+    }
+    
+    .userStoredCont-brief {
+        margin: 30rpx 0;
+        color: #ca9c5a;
+        text {
+            font-size: 22rpx;
+        }
+    }
+    
+    .userStoredCont-rights {
+        display: flex;
+    }
+    
+    .userStoredCont-rights-left {
+        background: linear-gradient(to top, #f6e4ca, #e4c6a3);
+        width: calc(100% - 230rpx);
+        margin-right: 30rpx;
+        height: 140rpx;
+        border-radius: 10rpx;
+        position: relative;
+    }
+    
+    .userStoredCont-price {
+        color: #806136;
+    }
+    
+    .userStoredCont-tips {
+        width: 100%;
+        height: 44rpx;
+        top: 10rpx;
+        right: 0;
+        position: absolute;
+        text-align: center;
+        color: #ffffff;
+        image,
+        text {
+            position: absolute;
+            height: 100%;
+            top: 0;
+        }
+        text {
+            width: 58%;
+            z-index: 2;
+            font-size: 25rpx;
+            right: 0rpx;
+            line-height: 44rpx;
+            text-align: center;
+            box-sizing: border-box;
+        }
+        image {
+            width: 70%;
+            right: -10rpx;
+        }
+    }
+    
+    .userStoredCont-price {
+        position: absolute;
+        bottom: 15rpx;
+        left: 20rpx;
+        z-index: 3;
+    }
+    
+    .userStoredCont-price {
+        font-size: 24rpx;
+        text {
+            font-size: 46rpx;
+            padding-right: 10rpx;
+        }
+    }
+    
+    .userStoredCont-fireworks {
+        position: absolute;
+        width: 84rpx;
+        height: 84rpx;
+        left: 10rpx;
+        bottom: 15rpx;
+        z-index: 1;
+    }
+    
+    .userStoredCont-rights-btn {
+        background-color: #222222;
+        color: #ffffff;
+        width: 200rpx;
+        text-align: center;
+        height: 70rpx;
+        line-height: 70rpx;
+        margin-top: 35rpx;
+    }
+    
+    
+    /* 漂浮弹出层 */
+    .indexFloat {
+        position: fixed;
+        height: 70%;
+        width: 130rpx;
+        right: 20rpx;
+        bottom: 40rpx;
+        z-index: 99;
+    }
+    
+    .indexFloat-movable {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 150rpx;
+        z-index: 99;
+        image {
+            width: 130rpx;
+            height: 130rpx;
+            margin-bottom: 20rpx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/userStored/storedCode.vue b/pages/userStored/storedCode.vue
new file mode 100644
index 0000000..0fc8da4
--- /dev/null
+++ b/pages/userStored/storedCode.vue
@@ -0,0 +1,308 @@
+<template>
+    <view>
+        <image class="codeTitle" src="/static/img/storedCode.png" mode="widthFix"></image>
+        <view class="codeCont-code">
+            <view class="codeCont-title">
+                向重要的人分享生活的惊喜
+            </view>
+            <image class="codeCont-img" :src="qrcode" mode="aspectFill"></image>
+        </view>
+        <view class="codeShare">
+            <view class="codeShare-label" @tap="removeSaveImg" hover-class="none">
+                生成海报
+            </view>
+        </view>
+        
+        <!-- 海报canvas -->
+        <canvas class="canvasImg" canvas-id="qrcodeCard"></canvas>
+        
+        <!-- 图片弹出层 -->
+        <view class="user-lay sign-img-lay" v-if="isImgLay">
+            <view class="user-back">
+                <image class="user-back-img" src="/static/img/storedCode.png" mode="widthFix"></image>
+                <view class="user-back-cont">
+                    <view class="codeBack-yard-name">
+                        向重要的人分享生活的惊喜
+                    </view>
+                    <image :src="qrcode" mode="aspectFill"></image>
+                </view>
+            </view>
+            <view class="longPress">长按图片保存二维码</view>
+            <button class="sign-img-btn remove-btn" size="mini" @tap="removeSaveImg">取消</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { publicCode } from '@/apis/interfaces/user'
+    export default {
+    	data() {
+    		return {
+                qrcode      : '',   //二维码
+                userInfo    : '',   //我的信息
+                isImgLay    : false,//是否显示图片弹出层
+                parentId    : '',   //是否分享进入
+                shareState  : false //显示分享朋友圈弹出层
+    		}
+    	},
+        onLoad(options) {
+            // 获取二维码
+            publicCode({
+                channel: 'h5',
+                type: 'recharge',
+                url: 'pages/userStored/index?type=shareStored'
+            }).then(res=>{
+                this.qrcode   = res.qrcode
+                this.userInfo = res.user
+            }).catch(err=>{})
+        },
+        methods: {
+            // 绘图
+            dowImg(){
+                uni.showLoading({
+                    title: '加载中',
+                })
+                
+                // 下载素材
+                let codeImg = new Promise(success => {
+                    wx.getImageInfo({
+                        src     : this.qrcode,
+                        success : res => {
+                            success(res.path)
+                        }
+                    })
+                })
+                
+                Promise.all([codeImg]).then(res => {
+                    // 绘制海报
+                    const ctx = uni.createCanvasContext('qrcodeCard')
+                    ctx.save()
+                    
+                    // 绘制背景
+                    ctx.setFillStyle('#e2e2e2')
+                    ctx.fillRect(0, 0, 375, 603)
+        
+                    // 绘制背景
+                    ctx.drawImage('/static/img/user-storedCode-down.png', 0, 0, 375, 650)
+        
+                    // 绘制二维码
+                    ctx.drawImage(res[0], 114, 400, 150, 150)
+
+                    // 文字
+                    ctx.setFontSize(26)
+                    ctx.setFillStyle("#222222")
+                    ctx.setTextAlign('center')
+                    ctx.fillText("向重要的人分享生活的惊喜", 194, 350 , 350)
+                                
+                    ctx.save();
+                    ctx.beginPath(); //开始绘制
+                    ctx.arc(70 / 2 + 156, 70 / 2 + 250, 70 / 2, 0, Math.PI * 2, false);
+                    ctx.clip();
+                    
+                    // 保存图片
+                    ctx.draw(true, () => {
+                        uni.hideLoading()
+                        uni.canvasToTempFilePath({
+                            canvasId: 'qrcodeCard',
+                            x: 0,
+                            y: 0,
+                            success: res => {
+                                this.qrcodeImg = res.tempFilePath
+                                this.removeSaveImg()
+                            }
+                        })
+                    })
+                    
+                }).catch(err=>{
+                    uni.showToast({
+                        title: '海报下载，请检查网络',
+                        icon : 'none'
+                    })
+                })
+            },
+            
+            // 图片弹出层
+            removeSaveImg(){
+                this.isImgLay = !this.isImgLay
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #e2e2e2;
+    }
+    
+    .codeTitle {
+        width: 100%;
+    }
+    
+    .codeTitle {
+        text-align: center;
+        width: 100%;
+    }
+    
+    
+    .codeCont {
+        margin: 0 auto;
+        width: 90%;
+        padding: 40rpx 0;
+    }
+    
+    
+    .codeCont-code {
+        text-align: center;
+        margin-bottom: 80rpx;
+    }
+    
+    .codeCont-img {
+        width: 380rpx;
+        height: 380rpx;
+    }
+    
+    .codeCont-title {
+        margin: 40rpx 0;
+        font-size: 46rpx;
+        font-weight: 600;
+    }
+    
+    .codeShare {
+        display: flex;
+        padding: 20rpx 50rpx;
+        box-sizing: border-box;
+    }
+    
+    .codeShare-label {
+        width: calc(100% - 80rpx) !important;
+        margin: 30rpx 40rpx;
+        font-weight: normal;
+        text-align: center;
+        height: 86rpx;
+        line-height: 86rpx;
+        padding: 0;
+        border-radius: 10rpx;
+        font-size: 32rpx;
+        color: #ffffff;
+        background: #b37f49;
+    }
+    
+    .codeShare-label image {
+        width: 80rpx;
+        height: 80rpx;
+        display: block;
+        margin: 0 auto 20rpx;
+    }
+    
+    .codeShare-button {
+        width: auto !important;
+        border: none;
+        background: transparent;
+        font-size: 28rpx;
+        margin: 0;
+        padding: 0;
+        font-weight: normal;
+    }
+    
+    
+    /* 弹窗背景图 */
+    .user-lay {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-box-pack: center;
+        position: fixed;
+        background: rgba(0, 0, 0, .6);
+        height: 100vh;
+        width: 100vw;
+        top: 0;
+        left: 0;
+        z-index: 99;
+        box-sizing: border-box;
+    }
+    
+    /* canvas */
+    .canvasImg {
+        position: absolute;
+        left: -1000%;
+        bottom: 0;
+        height: 650px;
+        width: 375px;
+        background: #fbf6f0;
+    }
+    
+    /* 图片弹出层 */
+    .sign-img-lay {
+        text-align: center;
+    }
+    
+    .sign-img-src {
+        width: 70vw;
+        vertical-align: top;
+    }
+    
+    .sign-img-btn[size="mini"],
+    .longPress{
+        margin: 40rpx auto 0;
+        background: #ffffff;
+        font-weight: normal;
+        color: #2f3245;
+        height: 90rpx;
+        line-height: 90rpx;
+        padding: 0;
+        width: 80%;
+        border-radius: 10rpx;
+        font-size: 30rpx;
+    }
+    
+    .longPress{
+        position: relative;
+        &::after{
+            position: absolute;
+            content: '';
+            left: calc(50% - 10rpx);
+            top: -20rpx;
+            width: 0;
+            height: 0;
+            border-left: 20rpx solid transparent;
+            border-right: 20rpx solid transparent;
+            border-bottom: 20rpx solid #ffffff;
+        }
+    }
+    
+    .remove-btn[size="mini"] {
+        margin-top: 20rpx;
+        background: #101010;
+        color: #e5c175;
+        font-weight: normal;
+    }
+    
+    /* 背景 */
+    .user-back-img {
+        width: 100%;
+        display: block;
+    }
+    
+    .user-back {
+        position: relative;
+        width: 80%;
+        text-align: center;
+        margin: 0 auto;
+    }
+    
+    .user-back-cont {
+        text-align: center;
+        background-color: #e2e2e2;
+        padding: 40rpx 0;
+        image {
+            width: 300rpx;
+            height: 300rpx;
+        }
+    }
+    
+    .codeBack-yard-name {
+        margin-bottom: 30rpx;
+        font-size: 36rpx;
+        font-weight: 600;
+    }
+
+</style>
\ No newline at end of file
diff --git a/pages/washcar/washcar.vue b/pages/washcar/washcar.vue
new file mode 100644
index 0000000..ed5ea59
--- /dev/null
+++ b/pages/washcar/washcar.vue
@@ -0,0 +1,22 @@
+<template>
+    <view>
+       <web-view :src="url"></web-view> 
+    </view>
+</template>
+
+<script>
+    export default {
+    	data() {
+    		return {
+                url: '' // h5连接地址
+            }
+        },
+        onLoad(options) {
+            this.url = decodeURIComponent(options.url)
+        },
+        methods:{}
+    }
+</script>
+
+<style>
+</style>
diff --git a/pages/webView/webView.vue b/pages/webView/webView.vue
new file mode 100644
index 0000000..2cc234f
--- /dev/null
+++ b/pages/webView/webView.vue
@@ -0,0 +1,23 @@
+<template>
+    <view>
+        <web-view :src="url"></web-view>
+    </view>
+</template>
+
+<script>
+    export default {
+    	data() {
+    		return {
+                 url: '' // 外部链接地址
+            }
+        },
+        
+        onLoad(options) {
+            // 接受链接地址
+            this.url = decodeURIComponent(options.url)
+        }
+    }
+</script>
+
+<style>
+</style>
diff --git a/pages/welfare/welfare.vue b/pages/welfare/welfare.vue
new file mode 100644
index 0000000..a2d4aef
--- /dev/null
+++ b/pages/welfare/welfare.vue
@@ -0,0 +1,910 @@
+<template>
+    <view>
+        <!-- 重要提示 -->
+        <view class="rightsPoint">
+        	<view class="rightsPoint-cont">
+        		<view class="rightsPoint-top">
+        			<image src="/static/icon/Point_icon.png"></image>
+        			<text>重要提示</text>
+        		</view>
+        		<view class="rightsPoint-text" :class="{active : notes.pointMoreShow}">
+        			<rich-text :nodes="notice.remark"></rich-text>
+        		</view>
+        		<view class="pointMore" @click="pointMoreTap">
+        			<text>{{ notes.pointMoreShow == true ? '展开' : '收起' }}</text>
+        			<image :src="notes.pointMoreShow == true ? '/static/img/pointMore-up.png' : '/static/img/pointMore.png'">
+        			</image>
+        		</view>
+        	</view>
+        </view>
+        
+        <!-- 权益内容 -->
+        <view style="padding-bottom: 220px">
+            <!-- 权益logo -->
+            <view class="cont">
+            	<view class="contBack">
+            		<image class="classBack" src="https://lifetest.ysd-bs.com/storage/materials/2021/08/09/class_back_02.png" mode="scaleToFill"></image>
+            		<view class="classCircle"></view>
+            		<view class="rightsCont">
+            			<scroll-view scroll-x class="welfareCont-top" scroll-with-animation>
+            				<view class="welfareCont-list-img" v-for="(item, index) in welfareData.right.logos" :key="index">
+            					<image :src="item" mode="aspectFill"></image>
+            				</view>
+            			</scroll-view>
+            			<view class="nowrap rightsCont-btn">
+            				{{ welfareData.right.subtitle}}
+            			</view>
+            		</view>
+            	</view>
+            </view>
+            
+            <!-- 数量 -->
+            <view class="rightsNumber">
+                <image class="rightsGoods-img" v-if="welfareData.right" :src="welfareData.right.goods_cover" mode="aspectFill"></image>
+                <view class="rightsGoods">
+                    <view class="nowrap rightsGoods-text">
+                        {{ welfareData.right.title }}
+                    </view>
+                    <view class="rightsGoods-price">
+                        <view class="rightsGoods-number"><text>￥</text>{{welfareData.detail.price}}</view>
+                        <view class="rightsAdd">
+                            <!-- @click="goodsNumber('remove')" -->
+                            <!-- @click="goodsNumber('plus')" -->
+                            <view class="rightsAdd-btn rightsAdd-remove" :class="{active : welfareData.num != 1}">-</view>
+                            <input class="rightsAdd-input" :data-num="welfareData.num" :value="welfareData.num" type="number" disabled=""></input>
+                            <view class="rightsAdd-btn rightsAdd-plus">+</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 金额 -->
+            <view class="rightsList" v-if="welfareData.detail">
+                <view class="rightsLabel">
+                    <view class="rightsLabel-left">{{welfareData.detail.attribute.form_pay}}</view>
+                    <view class="rightsLabel-right">￥{{welfareData.detail.total}}</view>
+                </view>
+                <view class="rightsLabel uni-border-top">
+                    <view class="rightsLabel-left">{{welfareData.detail.attribute.form_qty}}</view>
+                    <view class="rightsLabel-right">{{ welfareData.num }}</view>
+                </view>
+                <view class="rightsLabel uni-border-top">
+                    <view class="rightsLabel-left">{{welfareData.detail.attribute.form_type}}</view>
+                    <view class="rightsLabel-right rightsLabel-red">-￥{{welfareData.detail.score}}</view>
+                </view>
+            </view>
+            
+            <!-- 规格 -->
+            <block v-if="buyWay.platformCp[buyWay.platIndex]">
+                <view class="rightsList" style="margin-top: 20rpx">
+                    <block v-if="welfareData.right.type == 'physical'">
+                        <view class="rightsLabel">
+                            <view class="rightsLabel-left">请选择提交方式</view>
+                            <view class="rightsLabel-right rightsLabel-range">
+                                <picker :value="buyWay.platIndex" :range-key="'name'" :range="buyWay.platformCp" range-key="name" @change="platBind">
+                                    <view class="tabs-text">
+                                        {{ buyWay.platformCp[buyWay.platIndex].name }}
+                                    </view>
+                                </picker>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                        </view>
+                        <view class="rightsLabel rightsLabel-address" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <image class="rightsLabel-icon" src="https://card.ysd-bs.com/storage/materials/2021/09/01/new_rightsAddress.png"></image>
+                            <view v-if="welfareData.addressSee != ''" class="rightsLabel-right" @click="addressTap">
+                                <view class="rightsLabel-address-text">
+                                    <view class="rightsLabel-address-name">
+                                        {{ welfareData.addressSee.name }}<view class="rightsLabel-address-tel">{{ welfareData.addressSee.mobile }}</view>
+                                    </view>
+                                    <text class="nowrap">{{ welfareData.addressSee.all_address }}</text>
+                                </view>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </view>
+                            <navigator v-else class="rightsLabel-right" hover-class="none" url="/pages/address_form/address_form?type=Add">
+                                <view class="rightsLabel-address-text" style="line-height: 90rpx;">
+                                    添加收货地址
+                                </view>
+                                <image class="rightsLabel-row" src="/static/icon/rightsArrow.png"></image>
+                            </navigator>
+                        </view>
+                        <view class="rightsLabel" v-if="buyWay.platformCp[buyWay.platIndex].name == '快递'">
+                            <view class="rightsLabel-left">快递运费</view>
+                            <view class="rightsLabel-right">￥{{ welfareData.freight }}</view>
+                        </view>
+                    </block>
+                </view>
+            </block>
+            
+            <!-- 购买须知 -->
+            <view class="notice">
+                <view class="noticeTitle" @click="noticeTap">
+                    <view class="noticeTitle-flex">
+                        <image class="noticeTitle-img" src="/static/icon/notice_icon.png"></image>
+                        购买前请仔细阅读使用须知、内容介绍
+                    </view>
+                    <image class="noticeTitle-row" :class="{active : notice.noticeShow}" src="/static/icon/rightsArrow.png"></image>
+                </view>
+                <view class="noticeText" :class="{active : notice.noticeShow}">
+                    <view class="noticeText-top">内容介绍</view>
+                    <view class="noticeText-cont">
+                        <rich-text :nodes="notice.content"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 购买按钮 -->
+        <view class="newrightsBtn" @tap="submitOrder">
+        	<view class="rightsBtn-text">
+        		<view class="rightsBtn-text-num">共：{{ welfareData.num }}件商品  </view> 
+        		<view>实付：<text>￥{{ welfareData.total }}</text></view>
+        	</view>
+        	<button :disabled="disabled">立即购买</button>
+        </view>
+        <!-- 选择收货地址 -->
+        <view class="addressBack" :class="{active : address.addressShow}" @click="addressTap"></view>
+        <view class="addressCont" :class="{active : address.addressShow}">
+        	<view class="addressCont-title">
+        		<view class="addressCont-left">请选择收货地址</view>
+        		<view class="addressCont-right" @click="addSelect">新增收货地址</view>
+        	</view>
+        	<scroll-view class="header-classify" scroll-y="true">
+        		<view class="addressCont-list" v-for="(item,index) in address.allAddress" :key="index"
+        			@click="selectAddress(item.id, item)">
+        			<view class="addressCont-top">
+        				<view class="addressCont-name">{{ item.name }}</view>
+        				<view class="addressCont-tel">{{ item.mobile }}</view>
+        			</view>
+        			<view class="addressCont-text">
+        				{{ item.all_address }}
+        			</view>
+        			<view class="address-tool-icon">选择地址</view>
+        		</view>
+        	</scroll-view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { index, fridayInfo } from '@/apis/interfaces/welfares'
+    export default {
+		data() {
+			return {
+				welfareData   : {
+                    detail    : '',  // 福利内容
+                    right     : '',  // 福利内容
+                    welfaresId: '',  // 福利id
+                    addressSee: '',  // 收货地址
+                    num       : 1,   // 购买数量
+                    isDeliver : -1,  // 快递模式
+                    moreAmount: '',  // 产品总金额
+                    freight   : '',  // 运费
+                    total     : ''   // 总金额
+                },
+                buyWay        : {
+                    platformCp: [],  // 选择提交数组
+                    platIndex : 0,   // 选择提交方式下标
+                    isdeliver : -1   // 选择提交方式
+                },
+                address        : {
+                    allAddress : [],      // 收货地址列表
+                    addressShow: false    // 地址显示状态
+                },
+                notes         : {
+                    pointMoreShow : false// 重要提示-展开收起
+                },
+                notice        : {
+                    remark    : '',     // 购买须知
+                    content   : '',     // 内容介绍
+                    noticeShow: true   // 购买须知状态
+                },
+                from          : '',     // H5来源  unionpay银联
+                uniUrl        : '',     // 跳转H5页面
+                openid        : '',     // 银联是否存在openid
+                rightsTap     : false,  // 是否跳转H5
+                disabled      : false   // 下单按钮状态
+			}
+		},
+		onLoad(e) {
+            this.welfareData.welfaresId = e.id
+        },
+        onShow() { 
+            // 获取权益详情
+            this.rightsInfo();
+        },
+		methods: {
+            // 权益详情
+            rightsInfo() {
+                index(this.welfareData.welfaresId, {
+                    address_id : this.welfareData.addressSee.id,
+                    is_deliver : this.welfareData.isDeliver
+                }).then(res => {
+                    console.log(res.detail.right.type)
+                    console.log(this.buyWay)
+                    
+                    let obj    = res.detail.right.express
+                    let arr    = new Array
+                    arr = Object.keys(obj).map(val=>{
+                        return { ...obj[val], ...{key: val} }
+                    })
+                    
+                    if(this.buyWay.isdeliver == -1){
+                        if(res.detail.right.type == 'physical') {
+                            this.buyWay.isdeliver = res.detail.right.def_get
+                        }
+                        if(res.detail.right.type == 'virtual') this.buyWay.isdeliver = 1
+                    }
+                    
+                    this.welfareData.detail     = res.detail
+                    this.welfareData.right      = res.detail.right
+                    this.welfareData.moreAmount = res.amount
+                    this.welfareData.total      = res.total
+                    this.buyWay.platformCp    = arr
+                    this.welfareData.freight    = res.freight
+                    this.welfareData.addressSee = res.address
+                    this.address.allAddress   = res.all_address
+                    this.notice.remark        = res.detail.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    this.notice.content       = res.detail.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+                    
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
+                    })
+                })
+            },
+            
+            // 商品数量加减
+            goodsNumber(e){
+                let num = this.welfareData.num
+                if (e == 'plus'){
+                    num ++;
+                }else{
+                    if (num > 1){
+                        num --;
+                    }else{
+                        uni.showToast({
+                            title   : '商品数量不能小于1',
+                            icon    : 'none'
+                        })
+                    }
+                }
+                this.welfareData.num = num
+        
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 输入商品数量
+            goodsNumberInput(e){
+                let goodsNum   = e.detail.value
+                if (goodsNum > 0){
+                    this.welfareData.num = goodsNum
+                }else{
+                    uni.showToast({
+                        title   : '商品数量不能小于1',
+                        icon    : 'none'
+                    })
+                    this.welfareData.num = goodsNum
+                }
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 重要提示展开-收起
+            pointMoreTap() {
+                this.notes.pointMoreShow = !this.notes.pointMoreShow
+            },
+            
+            // 选择提交方式
+            platBind(e) {
+                this.buyWay.platIndex = e.detail.value
+                this.buyWay.isdeliver = this.buyWay.platformCp[e.detail.value].value
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 须知展开收起状态
+            noticeTap() {
+                this.notice.noticeShow = !this.notice.noticeShow
+            },
+            
+            // 收货地址弹出
+            addressTap() {
+                this.address.addressShow = !this.address.addressShow
+            },
+            
+            // 选择收货地址
+            selectAddress(id, item){
+                let new_addressId = id,
+                    addressId     = this.welfareData.addressSee.id
+                if (new_addressId != addressId) {
+                    this.welfareData.addressSee = item
+                    this.address.addressShow  = false
+                }else{
+                    this.address.addressShow  = false
+                }
+                // 获取详情
+                this.rightsInfo()
+            },
+            
+            // 支付提交
+            submitOrder() {
+                // 收货方式
+                if(this.buyWay.isdeliver.length == 0) this.buyWay.isdeliver = this.welfareData.detail.def_get
+                let welfareId   = this.welfareData.welfaresId,
+                    addressId   = this.welfareData.addressSee.id,
+                    isDeliver   = this.buyWay.isdeliver
+                fridayInfo(welfareId, {
+                    address_id  : addressId,
+                    is_deliver  : isDeliver
+                }).then(res=>{
+                    uni.navigateTo({
+                        url: "/pages/cashier/index?tradeNo=" + res.trade_no + "&price=" + this.welfareData.total + "&deliver=" + isDeliver + "&activity_type=" + res.type + "&type=default"
+                    })
+                }).catch(err => {});
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    /* 重要提示 */
+    .rightsPoint {
+        position: fixed;
+        left: 0;
+        bottom: 160rpx;
+        background: #eeeeee;
+        z-index: 9;
+        width: 100%;
+        padding: 20rpx 20rpx 10rpx;
+        box-sizing: border-box;
+        .rightsPoint-cont {
+            width: 100%;
+            background: #eeeeee;
+            border-radius: 10rpx;
+            position: relative;
+            max-height: 50vh;
+            overflow-y: scroll;
+            .rightsPoint-top {
+                font-size: 28rpx;
+                display: flex;
+                padding: 0 20rpx 20rpx;
+                box-sizing: border-box;
+                font-weight: 600;
+                image {
+                    width: 36rpx;
+                    height: 36rpx;
+                    margin-right: 10rpx;
+                }
+            }
+            .rightsPoint-text {
+                padding: 0 20rpx;
+                box-sizing: border-box;
+                font-size: 24rpx;
+                line-height: 44rpx;
+                height: 90rpx;
+                transition: height 25s;
+                overflow: hidden;
+                &.active {
+                    height: auto;
+                    transition: 2s;
+                }
+            }
+            .pointMore {
+                text-align: center;
+                width: 100%;
+                background: #eeeeee;
+                height: 80rpx;
+                line-height: 82rpx;
+                position: relative;
+                margin-top: 10rpx;
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+                text {
+                    font-size: 28rpx;
+                    color: #c38e00;
+                    animation: dong 1.8s infinite;
+                    display: inline-block;
+                }
+                image {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-left: 4rpx;
+                    vertical-align: -4rpx;
+                    animation: dong 1.8s infinite;
+                }
+                @keyframes dong {
+                    0% {
+                        transform: translate(0px, 0px);
+                    }
+                
+                    50% {
+                        transform: translate(0px, -6rpx);
+                    }
+                
+                    100% {
+                        transform: translate(0px, 0px);
+                    }
+                }
+                &::after {
+                    position: absolute;
+                    content: '';
+                    left: 0;
+                    top: 0;
+                    width: 100%;
+                    height: 2rpx;
+                    background: #f2ecde;
+                }
+            }
+        }
+    }
+    
+    // 数量
+    .rightsNumber {
+        background-color: #ffffff;
+        position: relative;
+        padding: 30rpx 40rpx;
+        box-sizing: border-box;
+        margin-bottom: 30rpx;
+        .rightsGoods-img {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+        }
+        .rightsGoods {
+            position: absolute;
+            left: 0;
+            top: 0;
+            width: 100%;
+            padding: 80rpx 40rpx 0 270rpx;
+            box-sizing: border-box;
+            .rightsGoods-text {
+                margin-bottom: 40rpx;
+                font-weight: 600;
+            }
+            .rightsGoods-price {
+                display: flex;
+                .rightsGoods-number {
+                    flex: 1;
+                    font-size: 34rpx;
+                    text {
+                        font-size: 28rpx;
+                    }
+                }
+                .rightsAdd {
+                    display: flex;
+                    .rightsAdd-btn {
+                        border-radius: 4rpx;
+                        text-align: center;
+                        width: 50rpx;
+                        height: 50rpx;
+                        line-height: 45rpx;
+                        font-size: 40rpx;
+                        font-weight: 600;
+                    }
+                    .rightsAdd-remove {
+                        background: #f8f8f8;
+                        color: #d9d9d9;
+                    }
+                    
+                    .rightsAdd-remove.active,
+                    .rightsAdd-plus {
+                        background: #e8e4e5;
+                        color: #6b6768;
+                    }
+                    
+                    .rightsAdd-input {
+                        width: 100rpx;
+                        text-align: center;
+                        font-size: 28rpx;
+                        line-height: 50rpx;
+                    }
+                }
+            }
+        }
+    }
+    
+    // 卡券权益内容
+    .cont {
+        width: 100%;
+        overflow: hidden;
+    }
+    .contBack {
+        position: relative;
+        width: 200%;
+        height: 340rpx;
+        left: -50%;
+        text-align: center;
+        background: #000000;
+        border-radius: 0 0 100% 100%;
+        overflow: hidden;
+        &::before {
+            position: absolute;
+            border-radius: 50%;
+            content: '';
+            z-index: 1;
+            background-color: rgba(255,255,255,.1);
+            right: 20%;
+            top: 55%;
+            width: 300rpx;
+            height: 300rpx;
+        }
+        .classBack {
+            position: absolute;
+            left: 28%;
+            right: 30%;
+            width: 44%;
+            top: 40rpx;
+        }
+        .classCircle {
+            position: relative;
+            &::before {
+                position: absolute;
+                border-radius: 50%;
+                content: '';
+                z-index: 1;
+                background-color: rgba(255,255,255,.1);
+                left: 20%;
+                top: -20rpx;
+                width: 260rpx;
+                height: 260rpx;
+            }
+        }
+        .rightsCont {
+            position: absolute;
+            z-index: 3;
+            left: calc(28% - 2rpx);
+            right: calc(30% - 2rpx);
+            width: calc(44% + 4rpx);
+            top: 50rpx;
+            .rightsCont-tips {
+                color: #fff;
+            }
+            .welfareCont-top {
+                white-space: nowrap;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-around;
+                width: 100%;
+                padding: 0 10rpx;
+                box-sizing: border-box;
+                margin: 50rpx 0 20rpx;
+                .welfareCont-list-img {
+                    border-radius: 50%;
+                    width: 120rpx;
+                    height: 120rpx;
+                    display: inline-block;
+                    margin: 0 15rpx;
+                    overflow: hidden;
+                    image {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+            .rightsCont-btn {
+                background: rgba(255, 255, 0255, .4);
+                width: 100%;
+                line-height: 70rpx;
+                font-size: 40rpx;
+                font-weight: 600;
+                color: #000000;
+                padding: 0 20rpx;
+                box-sizing: border-box;
+            }
+        }
+    }
+    
+    // 规格权益
+    .rightsList,
+    .notice,
+    .detailsStore {
+        background: white;
+        box-sizing: border-box;
+    }
+    .rightsLabel,
+    .rightsLabel-pay {
+        display: flex;
+        padding: 20rpx 30rpx;
+        box-sizing: border-box;
+        color: #6f7880;
+        font-size: 30rpx;
+        .rightsLabel-left {
+            flex: 1;
+            color: #747d86;
+        }
+        .rightsLabel-right {
+            display: flex;
+            font-size: 28rpx;
+            font-weight: 700;
+            &.rightsLabel-red{
+                color: #ff5b5d;
+            }
+            &.rightsLabel-score {
+                font-size: 34rpx;
+                color: #000000;
+            }
+        }
+        .rightsLabel-range {
+            display: flex;
+            color: #000;
+            font-weight: 600;
+        }
+        .rightsLabel-row {
+            width: 38rpx;
+            height: 38rpx;
+            margin: 2rpx 0 0 6rpx;
+        }
+    }
+    
+    // 购买须知
+    .notice {
+        background: white;
+        padding: 20rpx;
+        box-sizing: border-box;
+        margin-top: 30rpx;
+        .noticeTitle {
+            display: flex;
+            .noticeTitle-flex {
+                flex: 1;
+                display: flex;
+                font-size: 30rpx;
+                line-height: 46rpx;
+                .noticeTitle-img {
+                    width: 46rpx;
+                    height: 46rpx;
+                    margin-right: 20rpx;
+                }
+            }
+            .noticeTitle-row {
+                width: 46rpx;
+                height: 46rpx;
+                &.active {
+                    transform: rotate(90deg);
+                }
+            }
+        }
+        .noticeText {
+            font-size: 26rpx;
+            height: 0;
+            overflow: hidden;
+            &.active {
+                height: auto;
+            }
+            .noticeText-top {
+                margin: 30rpx 0 10rpx;
+                font-weight: 600;
+            }
+            .noticeText-cont {
+                line-height: 60rpx;
+            }
+        }
+    }
+    
+    // 购买按钮
+    .rightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 100rpx;
+        z-index: 9;
+        background: #fff;
+        button,
+        text {
+            display: block;
+            margin: 12rpx 30rpx;
+            width: calc(100% - 60rpx) !important;
+            height: 74rpx !important;
+            line-height: 74rpx !important;
+            padding: 0;
+            background: #eacf88;
+            text-align: center;
+            border-radius: 60rpx;
+            font-size: 30rpx;
+        }
+    }
+    .newrightsBtn {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 160rpx;
+        z-index: 9;
+        background: #fff;
+        padding: 30rpx;
+        box-sizing: border-box;
+        display: flex;
+        .rightsBtn-text {
+            flex: 1;
+            font-weight: 600;
+            font-size: 30rpx;
+            .rightsBtn-text-num {
+                font-size: 30rpx;
+                margin-bottom: 10rpx;
+            }
+            text {
+                font-size: 38rpx;
+                color: #fe2d55;
+            }
+        }
+        button {
+            width: 280rpx !important;
+            background-color: #000000;
+            color: #ffffff;
+            border-radius: 80rpx;
+            height: 100rpx;
+            line-height: 100rpx;
+            padding: 0;
+            margin: 0;
+        }
+    }
+    
+    // 收货地址新增样式
+    .rightsLabel-address {
+        display: flex;
+        position: relative;
+        margin: 10rpx 0;
+        padding: 25rpx 40rpx;
+    }
+    
+    .rightsLabel-address::after,
+    .rightsLabel-address::before {
+        position: absolute;
+        content: '';
+        left: 30rpx;
+        width: calc(100% - 60rpx);
+        height: 2rpx;
+        background-color: #bfbfbf;
+    }
+    
+    .rightsLabel-address::after {
+        top: 0;
+    }
+    
+    .rightsLabel-address::before {
+        bottom: 0;
+    }
+    
+    .rightsLabel-address text {
+        display: inline-block;
+        width: calc(100% - 46rpx);
+    }
+    
+    .rightsLabel-address .rightsLabel-right {
+        width: calc(100% - 90rpx);
+        margin-left: 20rpx;
+        color: #000000;
+    }
+    
+    .rightsLabel-address-text {
+        flex: 1;
+    }
+    
+    .rightsLabel-address .rightsLabel-row {
+        margin-top: 30rpx;
+    }
+    
+    .rightsLabel .rightsLabel-icon {
+        width: 70rpx;
+        height: 70rpx;
+        margin-top: 14rpx;
+    }
+    
+    .rightsLabel-address-name {
+        display: flex;
+        font-size: 32rpx;
+        margin-bottom: 10rpx;
+    }
+    
+    .rightsLabel-address-tel {
+        padding-left: 30rpx;
+        color: #959595;
+    }
+    
+    // 选择收货地址
+    .addressBack {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .4);
+        z-index: 10;
+        width: 100%;
+        height: 100%;
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .addressCont {
+        position: fixed;
+        left: 0;
+        bottom: -1000%;
+        transition: .2s;
+        background: #fff;
+        z-index: 11;
+        width: 100%;
+        &.active {
+            bottom: 0;
+        }
+        .addressCont-title {
+            height: 90rpx;
+            line-height: 90rpx;
+            display: flex;
+            padding: 0 30rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            font-weight: 600;
+            position: relative;
+            &::after {
+                position: absolute;
+                content: '';
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 2rpx;
+                background: #f3f3f3;
+            }
+            .addressCont-left {
+                flex: 1;
+            }
+            .addressCont-right {
+                color: #309ded;
+            }
+        }
+        .header-classify {
+            white-space: nowrap;
+            box-sizing: border-box;
+            height: 600rpx;
+            .addressCont-list {
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+                font-size: 30rpx;
+                overflow: hidden;
+                position: relative;
+                &::after {
+                	position: absolute;
+                	content: '';
+                	left: 0;
+                    bottom: 0;
+                	width: 100%;
+                	height: 2rpx;
+                	background: #f3f3f3;
+                }
+                .addressCont-top {
+                    display: flex;
+                    margin-bottom: 10rpx;
+                    .addressCont-name {
+                        font-weight: 600;
+                    }
+                }
+                .addressCont-text {
+                    color: #666;
+                    width: calc(100% - 160rpx);
+                }
+                .address-tool-icon {
+                    width: 120rpx;
+                    height: 54rpx;
+                    line-height: 54rpx;
+                    border-radius: 4rpx;
+                    text-align: center;
+                    color: #fff;
+                    position: absolute;
+                    top: 45rpx;
+                    right: 10rpx;
+                    background: #dfae2e;
+                    transform: scale(.9, .9);
+                    font-size: 24rpx;
+                }
+            }
+        }
+    }
+</style>
diff --git a/static/icon/Check.png b/static/icon/Check.png
new file mode 100644
index 0000000..414ff3b
Binary files /dev/null and b/static/icon/Check.png differ
diff --git a/static/icon/Point_icon.png b/static/icon/Point_icon.png
new file mode 100644
index 0000000..7eee5a3
Binary files /dev/null and b/static/icon/Point_icon.png differ
diff --git a/static/icon/activity_icon.png b/static/icon/activity_icon.png
new file mode 100644
index 0000000..6d54870
Binary files /dev/null and b/static/icon/activity_icon.png differ
diff --git a/static/icon/add.png b/static/icon/add.png
new file mode 100644
index 0000000..ad2ed18
Binary files /dev/null and b/static/icon/add.png differ
diff --git a/static/icon/address_icon.png b/static/icon/address_icon.png
new file mode 100644
index 0000000..70ca205
Binary files /dev/null and b/static/icon/address_icon.png differ
diff --git a/static/icon/arrow_down.png b/static/icon/arrow_down.png
new file mode 100644
index 0000000..8731b7a
Binary files /dev/null and b/static/icon/arrow_down.png differ
diff --git a/static/icon/arrow_left.png b/static/icon/arrow_left.png
new file mode 100644
index 0000000..94a76ab
Binary files /dev/null and b/static/icon/arrow_left.png differ
diff --git a/static/icon/arrow_right.png b/static/icon/arrow_right.png
new file mode 100644
index 0000000..d965a47
Binary files /dev/null and b/static/icon/arrow_right.png differ
diff --git a/static/icon/arrow_right_black.png b/static/icon/arrow_right_black.png
new file mode 100644
index 0000000..ca0d51d
Binary files /dev/null and b/static/icon/arrow_right_black.png differ
diff --git a/static/icon/arrow_tips.png b/static/icon/arrow_tips.png
new file mode 100644
index 0000000..d42d882
Binary files /dev/null and b/static/icon/arrow_tips.png differ
diff --git a/static/icon/choice.png b/static/icon/choice.png
new file mode 100644
index 0000000..18d62fa
Binary files /dev/null and b/static/icon/choice.png differ
diff --git a/static/icon/contentCard_icon.png b/static/icon/contentCard_icon.png
new file mode 100644
index 0000000..917c502
Binary files /dev/null and b/static/icon/contentCard_icon.png differ
diff --git a/static/icon/frozen_arrow.png b/static/icon/frozen_arrow.png
new file mode 100644
index 0000000..91e443d
Binary files /dev/null and b/static/icon/frozen_arrow.png differ
diff --git a/static/icon/giftPack-icon-yellow.png b/static/icon/giftPack-icon-yellow.png
new file mode 100644
index 0000000..af41ee7
Binary files /dev/null and b/static/icon/giftPack-icon-yellow.png differ
diff --git a/static/icon/giftPack-icon.png b/static/icon/giftPack-icon.png
new file mode 100644
index 0000000..083a730
Binary files /dev/null and b/static/icon/giftPack-icon.png differ
diff --git a/static/icon/indexSite.png b/static/icon/indexSite.png
new file mode 100644
index 0000000..11d5a8b
Binary files /dev/null and b/static/icon/indexSite.png differ
diff --git a/static/icon/integra_icon00.png b/static/icon/integra_icon00.png
new file mode 100644
index 0000000..969f039
Binary files /dev/null and b/static/icon/integra_icon00.png differ
diff --git a/static/icon/integra_icon01.png b/static/icon/integra_icon01.png
new file mode 100644
index 0000000..18f25e8
Binary files /dev/null and b/static/icon/integra_icon01.png differ
diff --git a/static/icon/location.png b/static/icon/location.png
new file mode 100644
index 0000000..186b0e4
Binary files /dev/null and b/static/icon/location.png differ
diff --git a/static/icon/navFooter_icon_00.png b/static/icon/navFooter_icon_00.png
new file mode 100644
index 0000000..5969817
Binary files /dev/null and b/static/icon/navFooter_icon_00.png differ
diff --git a/static/icon/navFooter_icon_01_active.png b/static/icon/navFooter_icon_01_active.png
new file mode 100644
index 0000000..3f1f757
Binary files /dev/null and b/static/icon/navFooter_icon_01_active.png differ
diff --git a/static/icon/news_icon.png b/static/icon/news_icon.png
new file mode 100644
index 0000000..2e4c687
Binary files /dev/null and b/static/icon/news_icon.png differ
diff --git a/static/icon/notice_icon.png b/static/icon/notice_icon.png
new file mode 100644
index 0000000..0975820
Binary files /dev/null and b/static/icon/notice_icon.png differ
diff --git a/static/icon/orderIcon_00.png b/static/icon/orderIcon_00.png
new file mode 100644
index 0000000..6c5bae8
Binary files /dev/null and b/static/icon/orderIcon_00.png differ
diff --git a/static/icon/orderIcon_01.png b/static/icon/orderIcon_01.png
new file mode 100644
index 0000000..f2f3f06
Binary files /dev/null and b/static/icon/orderIcon_01.png differ
diff --git a/static/icon/order_icon_00.png b/static/icon/order_icon_00.png
new file mode 100644
index 0000000..b1e0d85
Binary files /dev/null and b/static/icon/order_icon_00.png differ
diff --git a/static/icon/order_icon_01.png b/static/icon/order_icon_01.png
new file mode 100644
index 0000000..70b7f9b
Binary files /dev/null and b/static/icon/order_icon_01.png differ
diff --git a/static/icon/order_icon_02.png b/static/icon/order_icon_02.png
new file mode 100644
index 0000000..b70aedd
Binary files /dev/null and b/static/icon/order_icon_02.png differ
diff --git a/static/icon/refresh_loding.gif b/static/icon/refresh_loding.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/static/icon/refresh_loding.gif differ
diff --git a/static/icon/rightsArrow.png b/static/icon/rightsArrow.png
new file mode 100644
index 0000000..80006e1
Binary files /dev/null and b/static/icon/rightsArrow.png differ
diff --git a/static/icon/secrch_icon.png b/static/icon/secrch_icon.png
new file mode 100644
index 0000000..edd6bd6
Binary files /dev/null and b/static/icon/secrch_icon.png differ
diff --git a/static/icon/select.png b/static/icon/select.png
new file mode 100644
index 0000000..96b56f1
Binary files /dev/null and b/static/icon/select.png differ
diff --git a/static/icon/select_avtive.png b/static/icon/select_avtive.png
new file mode 100644
index 0000000..dc76782
Binary files /dev/null and b/static/icon/select_avtive.png differ
diff --git a/static/icon/site_icon.png b/static/icon/site_icon.png
new file mode 100644
index 0000000..94eb9a4
Binary files /dev/null and b/static/icon/site_icon.png differ
diff --git a/static/icon/storeArrow.png b/static/icon/storeArrow.png
new file mode 100644
index 0000000..4afb92b
Binary files /dev/null and b/static/icon/storeArrow.png differ
diff --git a/static/icon/switch.png b/static/icon/switch.png
new file mode 100644
index 0000000..1d8d0ea
Binary files /dev/null and b/static/icon/switch.png differ
diff --git a/static/icon/tel.png b/static/icon/tel.png
new file mode 100644
index 0000000..744f34e
Binary files /dev/null and b/static/icon/tel.png differ
diff --git a/static/icon/time_icon.png b/static/icon/time_icon.png
new file mode 100644
index 0000000..8e1f37f
Binary files /dev/null and b/static/icon/time_icon.png differ
diff --git a/static/img/accountsIcon_00.png b/static/img/accountsIcon_00.png
new file mode 100644
index 0000000..ad7569c
Binary files /dev/null and b/static/img/accountsIcon_00.png differ
diff --git a/static/img/accountsIcon_01.png b/static/img/accountsIcon_01.png
new file mode 100644
index 0000000..68dac83
Binary files /dev/null and b/static/img/accountsIcon_01.png differ
diff --git a/static/img/address_back.png b/static/img/address_back.png
new file mode 100644
index 0000000..9f10b85
Binary files /dev/null and b/static/img/address_back.png differ
diff --git a/static/img/arrow.png b/static/img/arrow.png
new file mode 100644
index 0000000..b34fba0
Binary files /dev/null and b/static/img/arrow.png differ
diff --git a/static/img/balance-icon-00.png b/static/img/balance-icon-00.png
new file mode 100644
index 0000000..8fa7345
Binary files /dev/null and b/static/img/balance-icon-00.png differ
diff --git a/static/img/balance-icon-01.png b/static/img/balance-icon-01.png
new file mode 100644
index 0000000..daa157d
Binary files /dev/null and b/static/img/balance-icon-01.png differ
diff --git a/static/img/balance-icon-02.png b/static/img/balance-icon-02.png
new file mode 100644
index 0000000..27002c2
Binary files /dev/null and b/static/img/balance-icon-02.png differ
diff --git a/static/img/balance-icon-03.png b/static/img/balance-icon-03.png
new file mode 100644
index 0000000..b1d9cad
Binary files /dev/null and b/static/img/balance-icon-03.png differ
diff --git a/static/img/balance-icon-row.png b/static/img/balance-icon-row.png
new file mode 100644
index 0000000..b03691e
Binary files /dev/null and b/static/img/balance-icon-row.png differ
diff --git a/static/img/campusCoupon_img.png b/static/img/campusCoupon_img.png
new file mode 100644
index 0000000..56a950d
Binary files /dev/null and b/static/img/campusCoupon_img.png differ
diff --git a/static/img/campusCoupon_user - 副本.png b/static/img/campusCoupon_user - 副本.png
new file mode 100644
index 0000000..7a64628
Binary files /dev/null and b/static/img/campusCoupon_user - 副本.png differ
diff --git a/static/img/campusIdx_back.png b/static/img/campusIdx_back.png
new file mode 100644
index 0000000..24314ca
Binary files /dev/null and b/static/img/campusIdx_back.png differ
diff --git a/static/img/campusIdx_icon_00.png b/static/img/campusIdx_icon_00.png
new file mode 100644
index 0000000..81bf120
Binary files /dev/null and b/static/img/campusIdx_icon_00.png differ
diff --git a/static/img/campusIdx_icon_01.png b/static/img/campusIdx_icon_01.png
new file mode 100644
index 0000000..dcf828b
Binary files /dev/null and b/static/img/campusIdx_icon_01.png differ
diff --git a/static/img/campusIdx_icon_02.png b/static/img/campusIdx_icon_02.png
new file mode 100644
index 0000000..ef158ff
Binary files /dev/null and b/static/img/campusIdx_icon_02.png differ
diff --git a/static/img/campusIdx_icon_03.png b/static/img/campusIdx_icon_03.png
new file mode 100644
index 0000000..fb4c7fb
Binary files /dev/null and b/static/img/campusIdx_icon_03.png differ
diff --git a/static/img/campusLogin_back.png b/static/img/campusLogin_back.png
new file mode 100644
index 0000000..957179f
Binary files /dev/null and b/static/img/campusLogin_back.png differ
diff --git a/static/img/campusLogin_back_01.png b/static/img/campusLogin_back_01.png
new file mode 100644
index 0000000..4693c45
Binary files /dev/null and b/static/img/campusLogin_back_01.png differ
diff --git a/static/img/campusLogin_logo.png b/static/img/campusLogin_logo.png
new file mode 100644
index 0000000..57c317c
Binary files /dev/null and b/static/img/campusLogin_logo.png differ
diff --git a/static/img/campus_details_back.png b/static/img/campus_details_back.png
new file mode 100644
index 0000000..cc0d705
Binary files /dev/null and b/static/img/campus_details_back.png differ
diff --git a/static/img/campus_login_00.png b/static/img/campus_login_00.png
new file mode 100644
index 0000000..eee3f3a
Binary files /dev/null and b/static/img/campus_login_00.png differ
diff --git a/static/img/campus_login_01.png b/static/img/campus_login_01.png
new file mode 100644
index 0000000..820d751
Binary files /dev/null and b/static/img/campus_login_01.png differ
diff --git a/static/img/campus_login_02.png b/static/img/campus_login_02.png
new file mode 100644
index 0000000..10ccbdc
Binary files /dev/null and b/static/img/campus_login_02.png differ
diff --git a/static/img/campus_login_03.png b/static/img/campus_login_03.png
new file mode 100644
index 0000000..54ebe0a
Binary files /dev/null and b/static/img/campus_login_03.png differ
diff --git a/static/img/campus_logo.jpg b/static/img/campus_logo.jpg
new file mode 100644
index 0000000..b14ee63
Binary files /dev/null and b/static/img/campus_logo.jpg differ
diff --git a/static/img/cashierTips_icon.png b/static/img/cashierTips_icon.png
new file mode 100644
index 0000000..2431c93
Binary files /dev/null and b/static/img/cashierTips_icon.png differ
diff --git a/static/img/dhImg.png b/static/img/dhImg.png
new file mode 100644
index 0000000..568dd6b
Binary files /dev/null and b/static/img/dhImg.png differ
diff --git a/static/img/draw-title.png b/static/img/draw-title.png
new file mode 100644
index 0000000..3831aea
Binary files /dev/null and b/static/img/draw-title.png differ
diff --git a/static/img/draw_choose.png b/static/img/draw_choose.png
new file mode 100644
index 0000000..ec509d9
Binary files /dev/null and b/static/img/draw_choose.png differ
diff --git a/static/img/draw_coupon.png b/static/img/draw_coupon.png
new file mode 100644
index 0000000..559a50f
Binary files /dev/null and b/static/img/draw_coupon.png differ
diff --git a/static/img/draw_coupon_active.png b/static/img/draw_coupon_active.png
new file mode 100644
index 0000000..79fddfe
Binary files /dev/null and b/static/img/draw_coupon_active.png differ
diff --git a/static/img/draw_login_02.png b/static/img/draw_login_02.png
new file mode 100644
index 0000000..a04af93
Binary files /dev/null and b/static/img/draw_login_02.png differ
diff --git a/static/img/draw_login_03.png b/static/img/draw_login_03.png
new file mode 100644
index 0000000..5f7c24b
Binary files /dev/null and b/static/img/draw_login_03.png differ
diff --git a/static/img/draw_login_04.png b/static/img/draw_login_04.png
new file mode 100644
index 0000000..b3e82a4
Binary files /dev/null and b/static/img/draw_login_04.png differ
diff --git a/static/img/draw_order.png b/static/img/draw_order.png
new file mode 100644
index 0000000..c9eaf3d
Binary files /dev/null and b/static/img/draw_order.png differ
diff --git a/static/img/giftPack-img01.png b/static/img/giftPack-img01.png
new file mode 100644
index 0000000..8150cb8
Binary files /dev/null and b/static/img/giftPack-img01.png differ
diff --git a/static/img/giftPack-img02.png b/static/img/giftPack-img02.png
new file mode 100644
index 0000000..61d2068
Binary files /dev/null and b/static/img/giftPack-img02.png differ
diff --git a/static/img/giftPack-img03.png b/static/img/giftPack-img03.png
new file mode 100644
index 0000000..8680409
Binary files /dev/null and b/static/img/giftPack-img03.png differ
diff --git a/static/img/giftPack-img04.png b/static/img/giftPack-img04.png
new file mode 100644
index 0000000..d97c468
Binary files /dev/null and b/static/img/giftPack-img04.png differ
diff --git a/static/img/giftPack-img05.png b/static/img/giftPack-img05.png
new file mode 100644
index 0000000..294c089
Binary files /dev/null and b/static/img/giftPack-img05.png differ
diff --git a/static/img/giftPack-img06.png b/static/img/giftPack-img06.png
new file mode 100644
index 0000000..08cb9d1
Binary files /dev/null and b/static/img/giftPack-img06.png differ
diff --git a/static/img/giftPack-img07.png b/static/img/giftPack-img07.png
new file mode 100644
index 0000000..a2df7b4
Binary files /dev/null and b/static/img/giftPack-img07.png differ
diff --git a/static/img/giftPack-img08.png b/static/img/giftPack-img08.png
new file mode 100644
index 0000000..6d524e0
Binary files /dev/null and b/static/img/giftPack-img08.png differ
diff --git a/static/img/giftPack-img09.png b/static/img/giftPack-img09.png
new file mode 100644
index 0000000..c46ca9e
Binary files /dev/null and b/static/img/giftPack-img09.png differ
diff --git a/static/img/giftPack-null.png b/static/img/giftPack-null.png
new file mode 100644
index 0000000..073f39d
Binary files /dev/null and b/static/img/giftPack-null.png differ
diff --git a/static/img/giftPack-user00.png b/static/img/giftPack-user00.png
new file mode 100644
index 0000000..71734fd
Binary files /dev/null and b/static/img/giftPack-user00.png differ
diff --git a/static/img/giftPack-user00_active.png b/static/img/giftPack-user00_active.png
new file mode 100644
index 0000000..8dbb522
Binary files /dev/null and b/static/img/giftPack-user00_active.png differ
diff --git a/static/img/giftPack-user01.png b/static/img/giftPack-user01.png
new file mode 100644
index 0000000..a4da1a5
Binary files /dev/null and b/static/img/giftPack-user01.png differ
diff --git a/static/img/giftPack-user01_active.png b/static/img/giftPack-user01_active.png
new file mode 100644
index 0000000..55a2dc3
Binary files /dev/null and b/static/img/giftPack-user01_active.png differ
diff --git a/static/img/giftPackCoupon_user.png b/static/img/giftPackCoupon_user.png
new file mode 100644
index 0000000..a3b962e
Binary files /dev/null and b/static/img/giftPackCoupon_user.png differ
diff --git a/static/img/gift_box.png b/static/img/gift_box.png
new file mode 100644
index 0000000..eed5968
Binary files /dev/null and b/static/img/gift_box.png differ
diff --git a/static/img/goodsCode_white.png b/static/img/goodsCode_white.png
new file mode 100644
index 0000000..68ffd6b
Binary files /dev/null and b/static/img/goodsCode_white.png differ
diff --git a/static/img/grant_icon.png b/static/img/grant_icon.png
new file mode 100644
index 0000000..72c945d
Binary files /dev/null and b/static/img/grant_icon.png differ
diff --git a/static/img/healthy_img00.png b/static/img/healthy_img00.png
new file mode 100644
index 0000000..5fdd6f4
Binary files /dev/null and b/static/img/healthy_img00.png differ
diff --git a/static/img/healthy_img01.png b/static/img/healthy_img01.png
new file mode 100644
index 0000000..1895d76
Binary files /dev/null and b/static/img/healthy_img01.png differ
diff --git a/static/img/healthy_img02.png b/static/img/healthy_img02.png
new file mode 100644
index 0000000..89c6e60
Binary files /dev/null and b/static/img/healthy_img02.png differ
diff --git a/static/img/healthy_img03.png b/static/img/healthy_img03.png
new file mode 100644
index 0000000..f871bab
Binary files /dev/null and b/static/img/healthy_img03.png differ
diff --git a/static/img/legal_tips.png b/static/img/legal_tips.png
new file mode 100644
index 0000000..7bb436f
Binary files /dev/null and b/static/img/legal_tips.png differ
diff --git a/static/img/login_back.png b/static/img/login_back.png
new file mode 100644
index 0000000..d4e8c09
Binary files /dev/null and b/static/img/login_back.png differ
diff --git a/static/img/logo.png b/static/img/logo.png
new file mode 100644
index 0000000..3203e2f
Binary files /dev/null and b/static/img/logo.png differ
diff --git a/static/img/luckClose.png b/static/img/luckClose.png
new file mode 100644
index 0000000..64f0a6e
Binary files /dev/null and b/static/img/luckClose.png differ
diff --git a/static/img/makeForm_price_back.png b/static/img/makeForm_price_back.png
new file mode 100644
index 0000000..d001603
Binary files /dev/null and b/static/img/makeForm_price_back.png differ
diff --git a/static/img/makeForm_price_back_active.png b/static/img/makeForm_price_back_active.png
new file mode 100644
index 0000000..a070a88
Binary files /dev/null and b/static/img/makeForm_price_back_active.png differ
diff --git a/static/img/null_icon.png b/static/img/null_icon.png
new file mode 100644
index 0000000..ca299cb
Binary files /dev/null and b/static/img/null_icon.png differ
diff --git a/static/img/oilCoupon_img.png b/static/img/oilCoupon_img.png
new file mode 100644
index 0000000..4783a5a
Binary files /dev/null and b/static/img/oilCoupon_img.png differ
diff --git a/static/img/oilIdx_back.png b/static/img/oilIdx_back.png
new file mode 100644
index 0000000..ce2f998
Binary files /dev/null and b/static/img/oilIdx_back.png differ
diff --git a/static/img/packetText_icon.png b/static/img/packetText_icon.png
new file mode 100644
index 0000000..893418f
Binary files /dev/null and b/static/img/packetText_icon.png differ
diff --git a/static/img/packet_arr.png b/static/img/packet_arr.png
new file mode 100644
index 0000000..4134220
Binary files /dev/null and b/static/img/packet_arr.png differ
diff --git a/static/img/pointMore-up.png b/static/img/pointMore-up.png
new file mode 100644
index 0000000..646061d
Binary files /dev/null and b/static/img/pointMore-up.png differ
diff --git a/static/img/pointMore.png b/static/img/pointMore.png
new file mode 100644
index 0000000..4c9b807
Binary files /dev/null and b/static/img/pointMore.png differ
diff --git a/static/img/profigLabel_row.png b/static/img/profigLabel_row.png
new file mode 100644
index 0000000..190c650
Binary files /dev/null and b/static/img/profigLabel_row.png differ
diff --git a/static/img/profig_billie_icon.png b/static/img/profig_billie_icon.png
new file mode 100644
index 0000000..1cb3ec0
Binary files /dev/null and b/static/img/profig_billie_icon.png differ
diff --git a/static/img/profig_billie_icon_active.png b/static/img/profig_billie_icon_active.png
new file mode 100644
index 0000000..20f040a
Binary files /dev/null and b/static/img/profig_billie_icon_active.png differ
diff --git a/static/img/refresh_loding.gif b/static/img/refresh_loding.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/static/img/refresh_loding.gif differ
diff --git a/static/img/rights_back_02.png b/static/img/rights_back_02.png
new file mode 100644
index 0000000..c6d7960
Binary files /dev/null and b/static/img/rights_back_02.png differ
diff --git a/static/img/shareTitle.png b/static/img/shareTitle.png
new file mode 100644
index 0000000..5c1488f
Binary files /dev/null and b/static/img/shareTitle.png differ
diff --git a/static/img/staff_null.png b/static/img/staff_null.png
new file mode 100644
index 0000000..2f98c33
Binary files /dev/null and b/static/img/staff_null.png differ
diff --git a/static/img/storedCode.png b/static/img/storedCode.png
new file mode 100644
index 0000000..6906bb6
Binary files /dev/null and b/static/img/storedCode.png differ
diff --git a/static/img/subscribe.jpg b/static/img/subscribe.jpg
new file mode 100644
index 0000000..38ce635
Binary files /dev/null and b/static/img/subscribe.jpg differ
diff --git a/static/img/subscribe_gzh.png b/static/img/subscribe_gzh.png
new file mode 100644
index 0000000..9d54fd8
Binary files /dev/null and b/static/img/subscribe_gzh.png differ
diff --git a/static/img/unicomIdx_back.png b/static/img/unicomIdx_back.png
new file mode 100644
index 0000000..94e5b9b
Binary files /dev/null and b/static/img/unicomIdx_back.png differ
diff --git a/static/img/unicom_back.png b/static/img/unicom_back.png
new file mode 100644
index 0000000..bdafe11
Binary files /dev/null and b/static/img/unicom_back.png differ
diff --git a/static/img/unicom_img.png b/static/img/unicom_img.png
new file mode 100644
index 0000000..704bd0a
Binary files /dev/null and b/static/img/unicom_img.png differ
diff --git a/static/img/unicom_logo.png b/static/img/unicom_logo.png
new file mode 100644
index 0000000..c52ab3b
Binary files /dev/null and b/static/img/unicom_logo.png differ
diff --git a/static/img/user-codeImg-down.png b/static/img/user-codeImg-down.png
new file mode 100644
index 0000000..f522e14
Binary files /dev/null and b/static/img/user-codeImg-down.png differ
diff --git a/static/img/user-storedCode-down.png b/static/img/user-storedCode-down.png
new file mode 100644
index 0000000..36d535b
Binary files /dev/null and b/static/img/user-storedCode-down.png differ
diff --git a/static/img/userCoupon.png b/static/img/userCoupon.png
new file mode 100644
index 0000000..ce5220b
Binary files /dev/null and b/static/img/userCoupon.png differ
diff --git a/static/img/userGoods_icon.png b/static/img/userGoods_icon.png
new file mode 100644
index 0000000..2fe8d86
Binary files /dev/null and b/static/img/userGoods_icon.png differ
diff --git a/static/img/userOrder_00.png b/static/img/userOrder_00.png
new file mode 100644
index 0000000..c24b234
Binary files /dev/null and b/static/img/userOrder_00.png differ
diff --git a/static/img/userOrder_01.png b/static/img/userOrder_01.png
new file mode 100644
index 0000000..0d0ca72
Binary files /dev/null and b/static/img/userOrder_01.png differ
diff --git a/static/img/userOrder_02.png b/static/img/userOrder_02.png
new file mode 100644
index 0000000..9950970
Binary files /dev/null and b/static/img/userOrder_02.png differ
diff --git a/static/img/userOrder_03.png b/static/img/userOrder_03.png
new file mode 100644
index 0000000..91a105e
Binary files /dev/null and b/static/img/userOrder_03.png differ
diff --git a/static/img/userOrder_04.png b/static/img/userOrder_04.png
new file mode 100644
index 0000000..4e5b8f6
Binary files /dev/null and b/static/img/userOrder_04.png differ
diff --git a/static/img/userOrder_05.png b/static/img/userOrder_05.png
new file mode 100644
index 0000000..bc3794e
Binary files /dev/null and b/static/img/userOrder_05.png differ
diff --git a/static/img/userOrder_06.png b/static/img/userOrder_06.png
new file mode 100644
index 0000000..6678f49
Binary files /dev/null and b/static/img/userOrder_06.png differ
diff --git a/static/img/userOrder_07.png b/static/img/userOrder_07.png
new file mode 100644
index 0000000..7617dd2
Binary files /dev/null and b/static/img/userOrder_07.png differ
diff --git a/static/img/userOrder_08.png b/static/img/userOrder_08.png
new file mode 100644
index 0000000..23ff6b0
Binary files /dev/null and b/static/img/userOrder_08.png differ
diff --git a/static/img/userOrder_09.png b/static/img/userOrder_09.png
new file mode 100644
index 0000000..f7f8dc1
Binary files /dev/null and b/static/img/userOrder_09.png differ
diff --git a/static/img/userOrder_10.png b/static/img/userOrder_10.png
new file mode 100644
index 0000000..9f5773d
Binary files /dev/null and b/static/img/userOrder_10.png differ
diff --git a/static/img/userOrder_11.png b/static/img/userOrder_11.png
new file mode 100644
index 0000000..9c3de30
Binary files /dev/null and b/static/img/userOrder_11.png differ
diff --git a/static/img/userSite.png b/static/img/userSite.png
new file mode 100644
index 0000000..6902bab
Binary files /dev/null and b/static/img/userSite.png differ
diff --git a/static/img/user_identity_00.png b/static/img/user_identity_00.png
new file mode 100644
index 0000000..e9e0876
Binary files /dev/null and b/static/img/user_identity_00.png differ
diff --git a/static/img/user_identity_01.png b/static/img/user_identity_01.png
new file mode 100644
index 0000000..35260a2
Binary files /dev/null and b/static/img/user_identity_01.png differ
diff --git a/static/img/wqb.jpg b/static/img/wqb.jpg
new file mode 100644
index 0000000..6c92cef
Binary files /dev/null and b/static/img/wqb.jpg differ
diff --git a/static/img/wx.jpg b/static/img/wx.jpg
new file mode 100644
index 0000000..fcb00a1
Binary files /dev/null and b/static/img/wx.jpg differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/tabBarIcon/00.png b/static/tabBarIcon/00.png
new file mode 100644
index 0000000..ab1675c
Binary files /dev/null and b/static/tabBarIcon/00.png differ
diff --git a/static/tabBarIcon/00_active.png b/static/tabBarIcon/00_active.png
new file mode 100644
index 0000000..0519763
Binary files /dev/null and b/static/tabBarIcon/00_active.png differ
diff --git a/static/tabBarIcon/01.png b/static/tabBarIcon/01.png
new file mode 100644
index 0000000..2f8d049
Binary files /dev/null and b/static/tabBarIcon/01.png differ
diff --git a/static/tabBarIcon/01_active.png b/static/tabBarIcon/01_active.png
new file mode 100644
index 0000000..d4ec6b3
Binary files /dev/null and b/static/tabBarIcon/01_active.png differ
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..777e480
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,24 @@
+import Vue from "vue"
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+    state: {
+        token: uni.getStorageSync('token') || ''
+    },
+    getters: {
+        getToken: state => {
+            return state.token
+        }
+    },
+    mutations: {
+        setToken(state, tokenString) {
+            state.token = tokenString
+            uni.setStorageSync('token', tokenString)
+        }
+    },
+    medules: {
+        
+    }
+})
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..845142d
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
+
+/* 图片尺寸 */
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
+
+/* Border Radius */
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 10px;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:40rpx;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:36rpx;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:30rpx;
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..204f31b
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,4 @@
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..60b7332
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,132 @@
+export default {
+	"pulldown": "\ue588",
+	"refreshempty": "\ue461",
+	"back": "\ue471",
+	"forward": "\ue470",
+	"more": "\ue507",
+	"more-filled": "\ue537",
+	"scan": "\ue612",
+	"qq": "\ue264",
+	"weibo": "\ue260",
+	"weixin": "\ue261",
+	"pengyouquan": "\ue262",
+	"loop": "\ue565",
+	"refresh": "\ue407",
+	"refresh-filled": "\ue437",
+	"arrowthindown": "\ue585",
+	"arrowthinleft": "\ue586",
+	"arrowthinright": "\ue587",
+	"arrowthinup": "\ue584",
+	"undo-filled": "\ue7d6",
+	"undo": "\ue406",
+	"redo": "\ue405",
+	"redo-filled": "\ue7d9",
+	"bars": "\ue563",
+	"chatboxes": "\ue203",
+	"camera": "\ue301",
+	"chatboxes-filled": "\ue233",
+	"camera-filled": "\ue7ef",
+	"cart-filled": "\ue7f4",
+	"cart": "\ue7f5",
+	"checkbox-filled": "\ue442",
+	"checkbox": "\ue7fa",
+	"arrowleft": "\ue582",
+	"arrowdown": "\ue581",
+	"arrowright": "\ue583",
+	"smallcircle-filled": "\ue801",
+	"arrowup": "\ue580",
+	"circle": "\ue411",
+	"eye-filled": "\ue568",
+	"eye-slash-filled": "\ue822",
+	"eye-slash": "\ue823",
+	"eye": "\ue824",
+	"flag-filled": "\ue825",
+	"flag": "\ue508",
+	"gear-filled": "\ue532",
+	"reload": "\ue462",
+	"gear": "\ue502",
+	"hand-thumbsdown-filled": "\ue83b",
+	"hand-thumbsdown": "\ue83c",
+	"hand-thumbsup-filled": "\ue83d",
+	"heart-filled": "\ue83e",
+	"hand-thumbsup": "\ue83f",
+	"heart": "\ue840",
+	"home": "\ue500",
+	"info": "\ue504",
+	"home-filled": "\ue530",
+	"info-filled": "\ue534",
+	"circle-filled": "\ue441",
+	"chat-filled": "\ue847",
+	"chat": "\ue263",
+	"mail-open-filled": "\ue84d",
+	"email-filled": "\ue231",
+	"mail-open": "\ue84e",
+	"email": "\ue201",
+	"checkmarkempty": "\ue472",
+	"list": "\ue562",
+	"locked-filled": "\ue856",
+	"locked": "\ue506",
+	"map-filled": "\ue85c",
+	"map-pin": "\ue85e",
+	"map-pin-ellipse": "\ue864",
+	"map": "\ue364",
+	"minus-filled": "\ue440",
+	"mic-filled": "\ue332",
+	"minus": "\ue410",
+	"micoff": "\ue360",
+	"mic": "\ue302",
+	"clear": "\ue434",
+	"smallcircle": "\ue868",
+	"close": "\ue404",
+	"closeempty": "\ue460",
+	"paperclip": "\ue567",
+	"paperplane": "\ue503",
+	"paperplane-filled": "\ue86e",
+	"person-filled": "\ue131",
+	"contact-filled": "\ue130",
+	"person": "\ue101",
+	"contact": "\ue100",
+	"images-filled": "\ue87a",
+	"phone": "\ue200",
+	"images": "\ue87b",
+	"image": "\ue363",
+	"image-filled": "\ue877",
+	"location-filled": "\ue333",
+	"location": "\ue303",
+	"plus-filled": "\ue439",
+	"plus": "\ue409",
+	"plusempty": "\ue468",
+	"help-filled": "\ue535",
+	"help": "\ue505",
+	"navigate-filled": "\ue884",
+	"navigate": "\ue501",
+	"mic-slash-filled": "\ue892",
+	"search": "\ue466",
+	"settings": "\ue560",
+	"sound": "\ue590",
+	"sound-filled": "\ue8a1",
+	"spinner-cycle": "\ue465",
+	"download-filled": "\ue8a4",
+	"personadd-filled": "\ue132",
+	"videocam-filled": "\ue8af",
+	"personadd": "\ue102",
+	"upload": "\ue402",
+	"upload-filled": "\ue8b1",
+	"starhalf": "\ue463",
+	"star-filled": "\ue438",
+	"star": "\ue408",
+	"trash": "\ue401",
+	"phone-filled": "\ue230",
+	"compose": "\ue400",
+	"videocam": "\ue300",
+	"trash-filled": "\ue8dc",
+	"download": "\ue403",
+	"chatbubble-filled": "\ue232",
+	"chatbubble": "\ue202",
+	"cloud-download": "\ue8e4",
+	"cloud-upload-filled": "\ue8e5",
+	"cloud-upload": "\ue8e6",
+	"cloud-download-filled": "\ue8e9",
+	"headphones":"\ue8bf",
+	"shop":"\ue609"
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..6319565
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,71 @@
+<template>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="[customIcons,customIcons?type:'']" @click="_onClick">{{icons[type]}}</text>
+</template>
+
+<script>
+	import icons from './icons.js';
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('data:font/truetype;charset=utf-8;base64,AAEAAAANAIAAAwBQRkZUTYoJ48wAAGf4AAAAHEdERUYAJwCMAABn2AAAAB5PUy8yWXpc3QAAAVgAAABgY21hcB9SCa8AAAPQAAADImdhc3D//wADAABn0AAAAAhnbHlmWWfecQAACAQAAFYcaGVhZBehAMAAAADcAAAANmhoZWEH+gSHAAABFAAAACRobXR4D3IujAAAAbgAAAIYbG9jYa77miAAAAb0AAABDm1heHABnACoAAABOAAAACBuYW1lj4vbUwAAXiAAAAM5cG9zdH/g11YAAGFcAAAGcwABAAAAAQAAGbvTeF8PPPUACwQAAAAAANoxE3MAAAAA2jSpUAAA/5UEHANrAAAACAACAAAAAAAAAAEAAAOA/4AAXASAAAAAAAQcAAEAAAAAAAAAAAAAAAAAAACGAAEAAACGAJwADAAAAAAAAgAAAAoACgAAAP8AAAAAAAAAAwQBAZAABQAAAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAEAAAAAAAAAAAAAAAUGZFZABAAB3o6QOA/4AAXAOAAIAAAAABAAAAAAIAAs0AAAAgAAEEAAAAAAAAAAFVAAAEAABLBAAAiQQAACEEAABLBAAAlwQAACkEAABdBAAAJwQAACgEAAAABAAAcwQAACcEAAAoBAAAAAQAACAEgABVBAAAegQAACgEAACcBAAAkgQAAAgEAADNBAAAyQQAAN0EAADJBAAAeAQAAAYEAABCBAAAVgQAAGoEAACEBAAAhAQAAEsEAAAxBAAAMQQAAEsEAAAcBAAASwQAAEsEAABLBAAASwQAAEsEAAAcBAAASwQAAEsEAABLBAAASQQAAOMEAAEABAAASwQAABwEAAAdBAAAbQQAAJ8EAAFABAABQAQAALgEAAALBAAASwQAAFYEAAA/BAAASwQAAEsEAADRBAAAZAQAAIMEAAALBAAAVgQAAEsEAABLBAAAZAQAAFAEAABRBAAAkgQAAAQEAABqBAAAAAQAAIwEAACMBAABLwQAAS4EAAC7BAAAuwQAAHIEAAByBAABHgQAAA0EAAA5BAAAQAQAADEEAAAxBAAACAQAABEEAAASBAAASQQAAEsEAAAABAAAAAQAAAAEAACDBAAAVQQAADwEAABVBAAAVgQAADwEAABWBAAAKAQAACYEAAAmBAAA1gQAAEEEAAFfBAAAZwQAAEsEAAA/BAAABgQAAAAEAAAABAAASwQAAHgEAAAABAAAhAQAAJIEAACEBAAARQQAAIQEEgAcBBIAHAQSABwEEgAcAVUAAAAAAAMAAAADAAAAHAABAAAAAAIcAAMAAQAAABwABAIAAAAAfABAAAUAPAAAAB3hAuEy4gPiM+Jk4wPjM+Ng42TkCeQR5DTkOeRC5GPkZuRo5HLlCOUw5TLlNeU35WDlY+Vl5WjliOWQ5gnmEufW59nn7+f15/roAegl6EDoR+hO6FboXOhe6GToaOhu6Hfoe+iE6JLooeik6K/osei/6Nzo5ujp//8AAAAAAB3hAOEw4gDiMOJg4wDjMuNg42PkAOQQ5DTkN+RA5GDkZeRo5HDlAOUw5TLlNOU35WDlYuVl5WflgOWQ5gnmEufW59nn7+f05/roAegi6DvoR+hN6FboXOhe6GToaOhu6HfoeuiE6JLooeik6K/osei/6Nzo5Ojp//8AAf/kHwMe1h4JHd0dsR0WHOgcvBy6HB8cGRv3G/Ub7xvSG9Eb0BvJGzwbFRsUGxMbEhrqGuka6BrnGtAayRpRGkkYhhiEGG8YaxhnGGEYQRgsGCYYIRgaGBUYFBgPGAwYBxf/F/0X9RfoF9oX2BfOF80XwBekF50XmwABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQYAAAEAAAAAAAAAAQIAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEoAmgEgAWIBkAH4AnACwgMUA5YD3AQkBE4EoAU0Ba4GPgauBvQHVgfsCFAIigjgCRIJmgnkCkAKigsUC2oLvgwUDHQM1A1ADaYN+A42DmQOqA8CDzIPcA+aD9oQEhBAEGoQsBEAEfoSNhJmEnoSjhK6ExwTaBQuFIAU2hVIFYwV6BY+FpwXChdSF6wX4Bh4GN4ZHhmAGd4aGho8GmIahBqqGtwbDhtAG3IbhBwMHLgdOh1wHaYeEB5oHsgfFB8uH5QgAiBSIIog7iGgIgQiMCLiIzQjhCPUJDwkbCSmJNolNCViJZwl5iY+Jpgm0CdCJ64n+CgqKHIowik6KcQqJCquKw4rDgAAAAMAS//LA7UDNQALAB0AKQAABT4BNy4BJw4BBx4BEw4BBy4BJz4BNx4BFxQGBy4BJz4BNy4BJw4BBx4BAgC4+AUF+Li59wUF+LhijCIrMAEEzJybzQQxKyKMYj9TAQJSPz9TAQJSNQX4uLj4BQX4uLj4AR4BOScwfEebzQQEzZtHfDEoOUoBWkZDWgICWkNGWQAAAAAEAIn/8gN3Aw0ACwAXACIALQAAAT4BNy4BJw4BBx4BNy4BJz4BNx4BFw4BASEWJy4BJw4BBwY3Bjc0NjceARUWJwIAT2gCAmhPTmkCAmlOMEMBAUIxMkEBAUL+wgIaagEBxbCwxQEBVhEBnZSUnQEQAYACclVUbgICb1RVcT4CTDo5SgEBSTk6Tf4xAUZbsQYGsVtGQgENO4kGBok7DQEABQAh/6wD4ANUAAsAFwAsADgAVQAAAT4BNy4BJw4BBx4BNy4BJz4BNx4BFw4BByIGBxYXNjceARcWJyEGByEWJy4BAT4BNy4BJw4BBx4BNyImPQEjLgE0NjsBNTQ2MhYdATMyFhQGByMVFAYCaU5pAgJoT05pAgJpTjFCAQFCMTFCAQFCMTplKRsVP1mUnAEBEf6FAQoBcmoBAsT94lt8AgJ7XFx7AwN7XAsRUgsPDwtSERcQUgsPDwtSEAHHAnJVVW0CAm9TVXI/AUw7OUkBAUk5Ok13GRYWHB8BBok7DQEhIAFGW7H+IQJ8XFx7AgJ7XF17Sg4NWAEPFg9ZDA4ODFkPFg8BWA0OAAAAAAMAS//LA7UDNQALABcAJAAABT4BNy4BJw4BBx4BEx4BFw4BBy4BJz4BARcOASImJzc+ATceAQIAuPgFBfi4ufcFBfi4P1ICAVM/P1MBAVMBRAEziJaJMgEchmNjhTUF+Li4+AUF+Li4+AKnAlpDRloBAllGQ1r+DQU1Ojo1BSlBAgJBAAIAl///A2kDAQALABgAAAE+ATcuAScOAQceAQMhMjY1LgEnDgEHFBYCAEdjAgJjR0diAgJixgIaMioCv6iovwIqAYwBalJRZgEBZ1FRav5yHB1ZqAYGqFkdHAAABAAp/7ID2ANOAAsAGgAmAEMAAAE+ATcuAScOAQceARciBgceARUUByEyNicuAQE+ATcuAScOAQceATciJic1IyImNDY7ATU+ATIWFxUzMhYUBisBFQ4BAm9HYgICYkdHYgICYkc3XycvNggBbTIqAQG//etcewMCfFxcewICe10MEAFRDA8PDFEBEBcQAVEMDg4MUQEQAdkCaVJRZgEBZ1FRaU8YFCZuQSAfHRxZqP4sAnxbXHwCAnxcXHtKDgxZDxcPWQwODgxZDxcPWQwOAAIAXf/cA6QDJAAnAE4AAAUWNj8BNic2LwEmIg8BBicuAycmPwE+AS8BJiMmDwEOARUUHgI3Ii4CJzY3Njc+AR8BFhQPAQYUFx4DFxYyPwE2Mh8BFgYPAQYCzDdQIQknAQE5fR0/GyEODxI6MiwNCg4hGgEVVycuKSsMJCBu0NRdU8CrbwEBMgQFEycMUwcKJhYQEzc0QhoWMhYmChUKfRMBEgYuIwEhJQosKC8oVhQaIQ4KDDIyMxUODiEbPx19OAEnCSBQN13V0G5Ca6vEVEgtAwQQAhN9ChUKJhcxFho+NDoUEBYmCgZUDCcUCDEAAAUAJwAPA9kC8QANABcAHQAhAC4AADchMjY1ETQjISIGFREUCQE2MyEyFwEGIgURNRcHJgERJzcBIiclFxY3Fj8BBQYjrQKyOz+G/U46QAGm/rwOFAKqFA/+vRsy/oD39gEDMPX1/RMSDQEAHCwtLC0cAQAOEw9CQwHZhEJC/ieFAVsBQAYH/sEbuwHZBPLzBAHc/iLx8f3gBv0bKwEBKxv9BgAAAgAo/74D2AM5ABkAMAAAJTYXFjM+ATcuAScOAQcUFh8BMiMXHgEXNzYBNiQ3FgQXBgQHIicxJgYHBj4BLwEuAQFlKSsjJK/kBATkr6/kBEQ/EgECBxkZARoM/ssFAQrJyQEKBQX+9skrKCtZaC1EIx0XSlVkDgkFBLyJibwEBLyJRnwvDQQTLxsNBgFMqOAEBOCoqd8FBghFHwxHVhkQN5kAAAADAAD/tQQAAuUAJwBAAFkAABcyNj8BFhczFx4BMz4BPQEzPgE3NS4BJyM1LgEnIQ4BBxEeARczFRQ3LgErASImJxE+ATMhMhYXFSMOAQcVFBcHBScuASsBIiYnNT4BMyEyFhcVDgErASIGB/ENGRB4J0t7dxAWDRIUD0RQAQFQRDgBUEn+AkdTAQFTRy82AQ8MRjA0AQE0MAH3MDQB6UdNAQeDAiZyChIOdi0xAQExLQFULTEBATEtJgwPASMMD2srAWYNDwEXFVUBTEfSR0wBG0lPAQFPSf63SU8BYSqjEA4zMgFFMjMzMhkBTEfSHRh5J2cJBzAv0C8wMC/QLzAODwAAAAEAc//xA40DDwAsAAAlHgEXFjc+ATU0Ji8BJiMGDwEGIicuAycmND8BNjc0LwEmByIGBw4BFR4BAUxf0V5TOxITDQ+EHRccHB8HFAcUPUEzCwUGHh4BFVwYJBUqEx8dAnjNXnsCAT8TKxYQHgtdFQEeHgYEDDNBPRQIEgcgHBwXHoEfARMSHkkpXs8ABAAnAA8D2QLxAAoAEQAYACQAAAEWNwEmIyEiBwEWBQkBBhURFAU2NRE0JwkBITI3AQcGIi8BARYCARobAXQYP/1ONxUBdxv+SwEv/tAKA6gKCf7R/gwCsjYV/swdKlwqHf7MGAFPARwBcRYV/o4c+gErASwSLP4nLhITLQHZKxL+1f6QFAEyHCoqHP7PFQAAAQAo/74D2AM5ABYAABM2JDcWBBcGBAciJzEmBgcGPgEvAS4BKAUBCsnJAQoFBf72ySsoK1loLUQjHRdKVQGtqOAEBOCoqd8FBghFHwxHVhkQN5kAAgAA/7IEAALtABwANQAAFzI2PwEuASc1PgE7AScuASchDgEHER4BFzMVFBYFPgE9ATM+ATc1LgEnIQ4BHQEUFhczFx4B5gsSDWoQFQEBXlT+AQRHPv4PP0oBAUo/PBECWQ8RJj9KAQFKP/6aQkhIQnODDRIbCwxiCy4s8FRdDjhCAQFGQf6cQksBaREUMwEUEGoBS0HdQUYBAUZB3UFLAXcMDAAHACAAGgP6AzYACwAgACwAOABEAE0AVgAAATYmBwYmNzYWBwYmAS4BJzQ2Nz4BBwY2NzYWBwYWFxYCAy4BBw4BFx4BNz4BAwYWNzYWBwYWNzYmAQ4BJy4BNz4BFx4BIyYOAR4BPgEmNyYOAR4BPgEmAxsJLCMgCx5JWRMNNf6enPEGS0SU0yEEGANzhCIECQu3zhoLrXp6mAULrXp6mBkjDiVqgxwGPQ8nuP7XGnU9OioYG2w7PDG5EygXCSUqGAsqBw8IAw8QCAQCEyMxBgM2CwxlRh0R/iYBh3g/ikSNBIYRBQEvMF8NCQNN/ssBAVBaCg56UVBbCg96AkIMPwMRkGkkFCGTzP2hODESFV80MzAOEV0IDiUkEQ4mJCEDBg4NBwYPDQAAAAYAVf/2BBwDCgAWAB8AKAA5AEMATQAAATIXLgEnDgEHFBYXBzceATMyNyY1PgEnMhYUBiImNDYHIiY0NjIWFAYBLgEnDgEHHgEXMjY3Fyc+ASUiJjQ2Nx4BFAYzIiY0NjceARQGAuMREBm/gZHBBEhBIncgOR8QEAoCozsUFxcoHh7bFB8fJxcXAs0EqHd9owMDo30ZNBpeGjRD/oAOFBQOExcXqQ4UFQ0TFxcCGwJqhQIDo31GdC1nPAcKASImc5hgFycXFycXVRcnFxcnF/7uaYwDA4xpaowDCwc0VidkZRUaFAEBFBsUFRoUAQEUGxQAAAAJAHr/+gOGAwYABwAQABgAIAAoAEAASABQAFgAACUOAR8BPgE3JRUWFzI3JyYGEyIHFxY3NSYFBgcUFzc2JzcOAQchMjYnBxUUHwEWOwEyPwE2PQE0LwEmKwEiDwEGJQcGFzM2NzQDERQWPwEuAQEeARcRLgEHAfUCAgKQPGMj/hRNWigl7QIFpycl7gUBTf5FJQEI7gMGETxjIwFRAgICtgJeAgOFAwJeAgJeAgOFAwJeAgIm7QQGzCUBrQUCkBZN/YQVTjUBBAKoAQQCkBVNNUXNJQEI7QICAhcH7gMFzSXdTVsoJe4FAsgWTTUFAp2EAwJeAgJeAgOEBAJdAwNdAwftBQJNWycBHf6wAgICkDxj/lw8YyMBUQICAgAAAAAFACj/xQPYAzsAGAAxADoAQwBMAAAFMjY/ASE+ATURNCYjISIGFREUFhczFRQWNzU0JisBIiY1ETQ2MyEyFhURFAYjISIGBwMuASIGFBYyNjcuASIGFBYyNjc0JiIGFBYyNgEvEBsTlAETYGRkYP3YYGRkYBUYKA8RNUE+PkECKEE+PkH+6hEXDFEBIDAgIDAgxAEgMCAgMCDEITAgIDAhOxERgwFlXwFIX2VlX/64X2UBbxkdTnwSD0A/AUg/QEA//rg/QAgNAScYICAwISEYGCAgMCEhGBggIDAhIQAAAAEAnP/ZA2QDJgApAAAlLgEnFAYHHgEHBiYnDgEnJjY3LgE1DgEHIiY3Nj8BJjY3HgEHFxYXFgYDWhE2AykrGDsIE8A0NMATCDsYKykDNhEIAhoMECYFgI2MgAQmEAwaAnEETQYoWiYHHhQOAgYGAg4UHgcmWigGTQROVigoX5TKBATIll8oKFZOAAAABACSAKUDbgJbAA8AHwAtAD8AABMVHgEzITI2PQE0JiMhIgYnITIWFREUBiMhIiYnET4BBRUUHwEWNjc1LgEPAQYnNz4BHgEVERQOASYvASY9ATTbARQQASUPFRUP/tsQFAEBbh4rKx7+kh4qAQEqAjEHJAkUAQEUCSQHKW0JFBQLCxQUCW0OAe7cDxUVD9wPFRVeKx7+3B4rKx4BJB4rtUwJBR4GCguGCwoGHgUlWAYDCRIL/uILEgkCB1gLEXARAAAAAAUACP/nA/gDGQAbADsARwBVAGQAABchNjcRJisBIiYvAS4BKwEiBg8BDgErASIHERY3IiY1ETQ2OwEyNj8BPgE7ATIWHwEeATsBMhYVERQGIyU+ATcuAScOAQceAQEyNjc0LgEiDgEVFBYXAS4BJz4BNzIeAhQOAo8C4oYBAYZkGBoNIw8nIasgKA8jDRoYYYYBAYcgIyMgcR0kECIRHhx/HB4RIhAkHXQgIyMg/pBkgwMDg2RkgwMDgwGYFh4BDhkcGQ4eF/7MSF8CAl9IIj0wGhowPRkBhAHBhA0QJhITExImEA2E/j+ERCIiAbkiIQ4SJRQPDxQlEg4hIv5HIiJEA4RkZIQCAoRkZIQBUR4WDxgODhgPFh4B/u8BYEhIXwIZMD5EPjAZAAAAAAMAzf+1AzMDSwANABkAQgAAAREuAScOAQcRHgEXPgEnFAYiJjURNDYyFhcBIgYUFjMhMjY0JisBNT4BNzU0JiIGHQEOAQcuASc1NCYiBgcVHgEXFQKcAVVGRlUBAVVGRlVAMVMyMlMxAf7lDhISDgF/DRMTDaB9lAITGxMBgXBvggETGhMBApR9AZUBDktbAgJbS/7yS1wBAVxLMDg4MAEOMDc3MP1TExsTExsTZAyggFcNExMNVW+CAgKCb1UNExMNV4CgDGQAAgDJ/8QDNwM3ABAAHwAAAS4BJw4BBx4BHwEWMj8BPgElPgE3HgEXBgIHBiInJgIC7gKCamqCAgJsWQoLJAsKWWz93QOwhISwAwm4SRQzE0m4AduBkQEBkYFL0nUODQ0OddNKprUBAbWmg/7YVhYWVQEpAAACAN3/xAMjAzwADQA2AAABES4BJw4BBxEeARc+AQEOARQWMyEyNjQmJyM1PgE3NTQmIgYHFQ4BBy4BJzUuASIGHQEeARcVAoIBRzo6RwEBRzo6R/63DRMTDQGQDRMTDah3iwESGhIBAX1mZn0BARIaEgGLdgGAATI9TAEBTD3+zjxNAQFN/sEBExoTExoTAV4MmndlDRISDWVkfAICfGRlDRISDWV3mgxeAAAAAgDJ/8QDNwM3AA4AGgAAEz4BNx4BFwYCBwYiJyYCJT4BNy4BJw4BBx4ByQOwhISwAwm4SRQzE0m4AS4vPgEBPi8vPgEBPgHbprUBAbWmg/7YVhYWVQEpOgE+Ly8+AQE+Ly8+AAUAeP/AA4cDQAARAB0APgBKAFkAAAEeAR0BFxEuAScOAQ8BFzU+AQEWMjY0JwEmIgYUFxMiBhQWMyEyNjQmKwE1NjcnBgcuASc1NCYiBh0BHgEXFQE0JiIGBxUUBxc2NQUyNjcnBiMiJic1JxUeAQHoJSxCAk9COkwJAT8BLAGLChsTCv00ChsUCp4NExMNAZANExMNp1I7LjVLZnwCEhsSAop3AUMSGhIBBTUP/tUZJA41Bg8iJgFCAU0DAgEzJ85CAQ5EVgEBQzYNPiwnM/0dChMbCgLNChQbCv0WExoTExoTXggqLiQBAn1kZQ0SEg1ld5sMXgHhDRISDWUZGTMuN5MJCTQHKSIaQ1RKSQAAAwAG//UD+gMLAAwAHwArAAAXITI3ESYnISIHERYzAS4BDwEnJiciDwERNjMhMhYVESU+ATcuAScOAQceAY0C5oYBAYb9GoYBAYYCQR1HHcFQGx4dGoABQQLkICL9kio5AQE5Kis5AQE5CoQCDIQBhf30hQGMGgEbrUgYARhzAdhDISL+J9MBOiorOQICOSsqOQAAAAQAQv/RA74DLwAbACUALAA4AAAFMj8BNjURJiciDwEnJiIPAQYVERQWMzI/ARcWJSI1ETQ/AREHBgUmLwERHwETETc2NxYXERQPAQYCjRgT4SUBMA8U5OkTMBTeJhoXDxXZ7Rj+GAYOwMIDAdYJCboNv0XCBAIFAQ6sCi8LfxUrAlIwAQt+jgwMfxUq/a4YGgx1hQxpBwITDwlv/cxrAQ4FBWkCMgh0/c8CNWkCAQEG/e0QCGQGAAADAFb/zQOmAzAACQARACkAAAE3NjQvASYGDwEBNwEnAQcGFgMhMjY3EQcRDgEjISInETYzITchIgcRFgN8HwsLCgobCx/+TVMBezv+hicCCasB9zo/AUUBHhf+C0ECAkEBc0X+R4YBAQLKHwwbCwsKAgof/gckAXo6/oZQBgr+w0NCAd1F/mshIkMB50NFhP4ShQAABgBq/6EDlgNfAB8AKQAzAEAATQBZAAAlEzMyNjQmJyM1NCYnIw4BBxUjDgEUFjsBEx4BFyE+AQE0NjsBMhYdASMDLgEnAyEDDgEHJzI2NxM0JiIGBwMUFiMyNjUDNCYiBhUTHgE3ETQmIgYHER4BMjYDLh4rDRISDbw5MqEyOAG6DRMTDSsdAzgvAYkuOP5eGBSWFBjuRxMYAR4CDxwBGBQ/Cw4BDA4VDgENDvMLDg0PFQ4NAQ2kDxUPAQEPFQ8GAnMSGxMBQC42AQE2LkABEhwS/Y0vNQEBNQMfEhcXEjz9JwEYEwJs/ZQTGAFMDw0BxA0PDwz+OwwQEAwBxQwPDw3+PA0PHAHFDA8PDP47DBAQAAAAAgCE/5wDfQNkABoAOAAAJTI2NREnFxYyNjQvASYiDwEOARYyPwEHERQWAyE2JxE2JyMVMzIWFREUBiMhJicRNjczNSMiFREUAgAOFAJdChsSCpEMGgyRCQERHApeAxToAeyHAQGHd3YgIiIg/hdCAQFCdniG7BMOAbhAYwoQGwmMDAyMCRoRCmRB/kgOE/6wAYQBp4QBRSIi/mEiIgFDAZ9DAUWF/lmFAAAAAAIAhP+xA30DTgAaADgAACUyPwE2NCYiDwE3ETQmIgYVERcnJiIGFh8BFgMhMicRNicjFTMyFhURFAYjISInETY3MzUjBhURFAIADQyRChIbCl0CFBwUA14KHBEBCpAM6QHshwEBh3x7ICIiIP4XQgEBQnp8hssMiwobEApkQAHEDhMTDv48QGQKEBsKiw3+6IQBu4QBRSMh/k0iIUMBs0MBRQGE/kWFAAMAS//LA7UDNQALABcANAAABT4BNy4BJw4BBx4BNy4BJz4BNx4BFw4BJTI/ARcWMjY0LwE3NjQmIg8BJyYiBhQfAQcGFBYCALj4BQX4uLn3BQX4uJvNBATMnJvNBAPO/tIPCnp5Ch4TCnp7ChQcCnt7ChwUCnp6ChQ1Bfi4uPgFBfi4uPhEBMycm80EBM2bnMyyC3p6ChMeCXp7ChwUCnt6ChMdCnp6CR4TAAACADH/9gPPAwkAIAA+AAAFMjY3ATY0JwEuASMiBh0BIwYCFx4BMxY2Nz4BFzMVFBY3Ij0BNAcjDgEHBiI1PgE3MxY9ATQ2MhcBFhQHAQYCKw8cEAFSFxf+rhIZDxccDebVAQEZEg4bCzinew0cLwYOOpnCJQIFAqzZOg4DBwMBMQUF/s8ECQ4OAT8YLBgBPBAPHheiAv7w8BwdAQ0TaFABpBYcXAamDwEBX1IEBZ7xBwEPqgMDA/7bBAgE/t8EAAACADH/9gPPAwkAIAA+AAAFMjY9ATM2FhceATcyNjc2AicjNTQmIyIGBwEGFBcBHgEnIicBJjQ3ATYyFh0BFDczHgEXFCInLgEnIyYdARQB1RYcDXunNwwbDhIZAQHV5g0cFw8aEf6uFxcBUhAbCQME/s8FBQExAwcDDjrZrAIGASXCmToOCRwWpAFQZxQNAR0c8AEQA6IWHg8Q/sQYLBj+wQ4OXAQBIQQIBAElAwMDqg8BB/GfBARSXwEBD6YGAAADAEv/ywO1AzUACwAXAEMAAAU+ATcuAScOAQceATcuASc+ATceARcOAQEeARc+ATc0JiIGFQ4BBy4BJz4BNzIXBwYeATI/ATY0LwEmIgYUHwEmIw4BAgC4+AUF+Li59wUF+LibzQQEzJybzQQDzv6lAmxSUWsCERgRAko4OUoCAko5CAcqCAEOFwhTCAhSCBgOBx4GBkpqNQX4uLj4BQX4uLj4RATMnJvNBATNm5zMAVRSbQICbVEMEBAMOUoCAko5OEoCASkIGA8IUwgXCVQIEBcIHwECaQACABz/sQPkA0kAGQA9AAAXFj8BFxY2JwM3NiYjBQMmIgcDJSIGHwEDBjciPwE2LwEmNjMFFj8BNjIfARY3JTIWDwEGHwEWBi8BJg8BBtsaKOPjKDUQWeUoFDL+51UPQRBV/ucxFSnlWhBZAQFVCRbVAwEEAQMaCEoCAwFKCBoBBAMBA9UWClUBAgPOFhXPAjwTHqamHicuAQukHD8CAQwvL/70Aj8cpP71LkEE9RkPkwIDBQEa+AQE+BoBBQMCkw8Z9QQCA50QEJ4CAAADAEv/ywO1AzUACwAXADQAAAU+ATcuAScOAQceATcuASc+ATceARcOASc+ATc1MzI2NCYnIzUuASIGHQEjDgEUFjsBFRQWAgC4+AUF+Li59wUF+LibzQQEzJybzQQDzpwREwGGEhYVE4YBEyIShhMWFxKGEjUF+Li4+AUF+Li4+EQEzJybzQQEzZuczJwBFRN/EiMSAYYTFhYThgESIxJ/EhYAAAMAS//LA7UDNQALABcAIwAABT4BNy4BJw4BBx4BNy4BJz4BNx4BFw4BASEyNjQmIyEiBhQWAgC4+AUF+Li59wUF+LibzQQEzJybzQQDzv64AVkSFhUT/qcTFhc1Bfi4uPgFBfi4uPhEBMycm80EBM2bnMwBRBIiExMiEgACAEv/ywO1AzUACwAXAAAFPgE3LgEnDgEHHgE3LgEnPgE3HgEXDgECALj4BQX4uLn3BQX4uJvNBATMnJvNBAPONQX4uLj4BQX4uLj4RATMnJvNBATNm5zMAAAAAAIAS//LA7UDNQALACgAAAU+ATcuAScOAQceATciJjQ/AScmNDYyHwE3Nh4CDwEXFhQGIi8BBwYCALj4BQX4uLn3BQX4Hg8VC4CACxUeCoGBCx0UAQuAgAoVHgqAgAs1Bfi4uPgFBfi4uPjyFR4KgYAKHhQKgIAMARQeCoGACh8VCoGBCgAAAAACAEv/ywO1AzUACwA3AAAFPgE3LgEnDgEHHgEDPgE3MhcnJjQ2Mh8BHgEPAQYiJjQ/ASYHDgEHHgEXPgE3NDYyFhUOAQcuAQIAuPgFBfi4ufcFBfgLA2tMBgYfBw8YCFQHAQhUCRcPCCoHCDpMAQFMOjlLAhEZEQJtUlNuNQX4uLj4BQX4uLj4AZ5SawIBHwgYEAhWCBgIVAgPGAgqAQEBSzk6SwICSzoMEREMU24CAm8AAAABABz/sQPkA0kAGQAAFxY/ARcWNicDNzYmIwUDJiIHAyUiBh8BAwbbGijj4yg1EFnlKBQy/udVD0EQVf7nMRUp5VoQPBMepqYeJy4BC6QcPwIBDC8v/vQCPxyk/vUuAAACAEv/ywO1AzUACwAoAAAFPgE3LgEnDgEHHgE3IiY9ASMiJjQ2OwE1NDYyFh0BMzIWDgErARUUBgIAuPgFBfi4ufcFBfi3EhONExcWFI0TJBSNFBcBFhSNFDUF+Li4+AUF+Li4+NsXE4UTJROOExcWFI4TJROFFBYAAAAAAgBL/8sDtQM1AAsAFwAABT4BNy4BJw4BBx4BEyImNDYzITIWFAYjAgC4+AUF+Li59wUF+AMUFxcUAWoUFhcTNQX4uLj4BQX4uLj4AYoTJRMTJRMAAwBL/8sDtQM1AAsAFwAjAAAFPgE3LgEnDgEHHgE3LgEnPgE3HgEXDgEnPgE3LgEnDgEHHgECALj4BQX4uLn3BQX4uJvNBATMnJvNBAPOm3SeAwOedHadAwOeNQX4uLj4BQX4uLj4RATMnJvNBATNm5zMUgOedXWeAwOedXWeAAACAEn/yQO3AzcACwAgAAAFLgEnPgE3HgEXDgETJiIPAQYiLwEmIgYUHwEWMj8BNjQCALr4BQX4urr4BQX4CwkaCcgKGQk7ChkTCWgJGQr0CTcF+Lq6+AUF+Lq6+AJGCQnICgo6ChMZCmcJCfQKGQAAAQDjAGMDHQKdABsAADcGFBYyPwEXFjI2NC8BNzY0JiIPAScmIgYUHwHuCxYfDNzcCx8XC9zcCxcfC9zcDB8WC9ukCx8XC9zcCxcfC9zcCx8XC9zcCxcfC9wAAAABAQAAgAMAAtgAFgAAJS4BJz4BNzUXBzUOAQceARc+ATczDgECAG2QAwOQbcDAXHoCAnpcXHoCKAOQgAOQbW2QA1iAb28CelxcegICelxtkQAAAAABAEv/nQO1A14AKQAABT4BNy4BJyYOARYXHgEXDgEHLgEnPgE3FR4BPwE2NC8BJgYHFQ4BBx4BAgC4+AUBYlQPHREHDUVRAQPOm5vNBAOafAEZEooODokSGgGZxgMF+GMF+LhtuD0LBRwbCjKYXZvNBATNm4XAHj4WDA1gChsLYAwLFz0g66K4+AAAAAIAHP+xA+QDSQAZAC0AABcWPwEXFjYnAzc2JiMFAyYiBwMlIgYfAQMGJRE2HwEWNyUyFg8BBh8BFgYvASbbGijj4yg1EFnlKBQy/udVD0EQVf7nMRUp5VoQAUACAUoIGgEEAwED1RYKVQECA84KPBMepqYeJy4BC6QcPwIBDC8v/vQCPxyk/vUu5wIiAQT4GgEFAwKTDxn1BAIDnQgAAAAMAB3/nQPjA2MADAAZACYAMwBAAE0AWgBnAHQAgQCOAJsAAAEiBgcVHgEyNjc1LgEHDgEfAR4BPgEvAS4BBSYGDwEGHgE2PwE2JgUGFh8BFj4BJi8BJgYFLgEPAQ4BHgE/AT4BFzQmJyMOARQWFzM+ASUUFhczPgE0JicjDgEFNiYvASYOARYfARY2JR4BPwE+AS4BDwEOAQU+AS8BLgEOAR8BHgElFjY/ATYuAQYPAQYWFzI2NzUuASIGBxUeAQIADREBAREaEQEBEf4MBgZMBxgWBwdMBxcB2AwXCEwGBxYYB0wGBv1gBgcLhAsYDQYMhAsYAz8HGAuFCwYNFwyECwc6EQ6YDRERDZgOEfw6EQ2ZDRERDZkNEQOGBgcLhAwXDQYLhAwY/MEHGAuFCwYNGAuECwcCmgwGBkwHGBcGBkwIF/4pCxcISwcGGBcHTAYG/Q0RAQERGhEBAREDYxEOmA0REQ2YDhFABxgLhQsGDRgLhAsHBgYHC4QLGQwGC4ULGKoMFwhMBgYXGAdMBgYMDAYGTAcYFwYGTAgX5g0RAQERGhEBARENDREBAREaEQEBEf4LFwhMBgYXGAdMBgYMDAYGTAcYFwYGTAgXvQcYC4ULBg0XDIQLBwYGBwuEDBcNBgyECxhHEQ6YDRERDZgOEQAAAAIAbf/pA5QDFwAVACEAACUyNjcXFjI+AS8BPgE3LgEnDgEHHgE3LgEnPgE3HgEXDgEBtjRhK8sOKhoBDsogIwEEuoyMugMDuoxtkwICk21tkwMDk4QgHssOGykPyiplOYu7AwO7i4y6QwOTbW2SAwOSbW2TAAAAAAEAnwAXA2EC6AAcAAAlPgE1ESE+ATQmIyERNCYiBhURISIGFBYXIREUFgIAEBYBFRAWFhD+6xYgFv7rEBYWEAEVFhcBFQ8BHQEWIBYBHg8VFQ/+4hYgFgH+4w8VAAAAAAEBQABAAsACwAAFAAABNwkBJwEBQEEBP/7BQQD/An9B/sD+wEEA/wABAUAAQALAAsAABQAAAScJATcDAsBB/sEBP0H/An9B/sD+wEEA/wAAAQC4AIUDWgJ/ABcAAAEXFhQHAQYiLwEmND8BNjIfARYyNwE2MgNDDQoK/lwLHQy1CwsNCx0LdQwdCwFjCx0CdA0LHQv+XAsLtgsdDAwLC3UKCgFjCwAAAAIAC/+9A/UDQwAnAD0AABchPgE1ERcWFzI2NyYvATU0JicjDgEdAScmIgcBBgceATM2PwERFBYBNCYrASIGFREjJicRAT4BFwERBgcj5wIzLjI3DRIQFAEBDJURDjgOEaoXOBf+SwwBARQQEg03MwHCEQ+2DxKPKQEBJgcQBwEmASmQQwExLQGHMg4BEg8TCof9DhABARAOkZoVFf5yCRMPEgEOMv55LjABYQ8REQ/+4wEqAbUBDAYBB/70/ksqAQAAAAADAEv/ywO1AzUACwAXACwAAAU+ATcuAScOAQceATcuASc+ATceARcOASUyPwE2Mh8BFjI2JicDJiIHAwYUFgIAuPgFBfi4ufcFBfi4m80EBMycm80EA87+tQsGlAYKBpMIFQ0BA6QLKgqlAww1Bfi4uPgFBfi4uPhEBMycm80EBM2bnMyIB5QFBZQHDRMJAaMaGv5dCBQNAAQAVv/TA6wDKgAtAGYAcgB+AAAlNjc+ATc2NyY2NyYnBiY3NSYnBwYiLwEHFRYGJyMHFxYUDwEWFzM2FgcWFz4BByYnNzYmDwEmJzc2NC8BNjcXFjYvATY3FxYyPwEWFwcGFj8BFhcHBhQfAQYHJyYGHwEGBycmIg8BEz4BNy4BJw4BBx4BFy4BJz4BNx4BFw4BAoYPDwJlTQcGNwI4BAZSaQILDAI6lzoGEwJrUwoHBj09AwUFBFJrAQ4OOJGsQzsCATovMSMRJyEhKQ8gOC86AQM4PiUgUyAiQDcCATsuLCMOHiIiHBElJS86AQI8RBkgUyAcXy8+AQE+Ly8+AQE+L0ZdAgJdRkZdAgJdGwYHTWUCDw85kTgODgFrUgQFBQM9PQcIClNrAhMGOpc5AwwLAmlSBgQ4An4OIywvOgECN0AiIFMgJT44AwE6LzggDykhIScRIzEvOgECO0McIFMgGUQ8AgE7LiUlERwiIh8BPwE+Ly8+AQE+Ly8+OAJdRkZdAgJdRkZdAAAAAAMAP/+/A8EDQQAUACAALQAABTI2NwE2NCYiBwEOARUUFhcFEx4BAyUmNDclNj8BBwYHAyInAwE+ATcHBgcDBgJXFyIMARkMGCse/R8cJCgfATVaCRxr/tgKCQJEGRkxLhcSmAQDWgEmEigRFwwK2wRBJR8C3R4rGAz+5QohFx0cCVr+ziEpAb1aAwgE2woMFyUTEv15CgEoAScSMBYxGRr9vAkABABL/8sDtQM1AAsAFwAgADkAAAU+ATcuAScOAQceATcuASc+ATceARcOAQMyNjQmIgYUFgMzPgE0JisBNTQmKwEiBhQWOwEVIyIGFBYCALj4BQX4uLn3BQX4uJvNBATMnJvNBAPOnxgfHzAfIDCuDhERDjUREFENEhINLjUOERE1Bfi4uPgFBfi4uPhEBMycm80EBM2bnMwCASAvICAvIP57ARAaEdoSFREaEcURGhAAAAAABABL/8sDtQM1AAsAFwA8AEUAAAU+ATcuAScOAQceATcuASc+ATceARcOAQM+AT0BNDY3PgE3LgEOAQcGFRQWMzI2NzY3HgEVFAYHDgEdARQXPgE0JiIGFBYCALj4BQX4uLn3BQX4uJvNBATMnJvNBAPOpBATFRYgJwECTnBFCQQSCxIPCRUrHSMbHBgeIRMbGicbGzUF+Li4+AUF+Li4+EQEzJybzQQEzZuczAEPARENBREbDxMvJTY4ASseCwsODxEMJQEBHRkVHhIQJx8GIoABGSYZGSYZAAAAAAMA0f/LAy8DNQAUABwAKwAAASIGBxUGFREUFjMhMjY1ETQnNS4BBz4BMhYXFSEFMhYVERQGIyEGNRE0NjMCAF2FA0owMAGeMDBKA4X9AlqIWgL+wAFtDw4OD/5mHQ4PAzWBg2IJW/7FNDExNAE7Wwlig4H7Wl9fWmlBDhL+vBIPASIBRBIOAAAGAGQBLgOdAdMACAASABsAJQAuADgAAAEeARQGIiY0NjcOARQWMjY0JicFHgEUBiImNDY3DgEUFjI2NCYnBR4BFAYiJjQ2Nw4BFBYyNjQmJwIAFBoaKBoaFCMvL0YvLyP+thMbGycaGhQkLi5HLy8jApUUGhonGxsTIy8vRy4uJAGvARooGhooGiUBL0YvL0YvASQBGigaGigaJQEvRi8vRi8BJAEaKBoaKBolAS9GLy9GLwEAAAAAAgCD/9sDfQMlACEANAAAFz4BNzU+ATceARcyPgI3ES4BIw4BBy4BJyIOAgcRHgEBLgEnIgYHET4BMx4BFzY3EQ4BpA4SAQg6MHO4bTE1LRoBARkTD0A3brd0MTUtGgEBEgI5Z7l4JDwSBDYybrhzRiwFNSUBEg7uBA8BBUQFCxUkHQG0ERMBEAEFRAULFSQd/TgOEgEVBUQFCAgBkwsWBEQFAQ3+bwsWAAAAAAIAC/+9A/UDQwAhADkAABMeATM2NwE2MhcBFhcyNjcmLwE1NCYnIw4BHQEnJiIHAQYTFBYXMxE0NjczHgEVETM+ATURASYiBwELARQQEg0BogcQBwGiDRIQFAEBDJUQDjkOEaoXOBf+Swx6My2uEg+XDxKtLjL+lAcPB/6VAYMPEgEOAX0HB/6DDgESDxMKh/0OEAEBEA6SmxUV/nMK/oYtMQEBMQ8RAQERD/7PATEtATkBSAcH/rYAAAAAAgBW/9MDrAMqADgARAAABSYnNzYmDwEmJzc2NC8BNjcXFjYvATY3FxYyPwEWFwcGFj8BFhcHBhQfAQYHJyYGHwEGBycmIg8BNz4BNy4BJw4BBx4BAaFDOwIBOi8xIxEnISEpDyA4LzoBAzg+JSBTICJANwIBOy4sIw4eIiIcESUlLzoBAjxEGSBTIBxfTmcCAmdOTmcCAmcsDiMsLzoBAjdAIiBTICU+OAMBOi84IA8pISEnESMxLzoBAjtDHCBTIBlEPAIBOy4lJREcIiIf9gJnTk5nAgJnTk5nAAMAS//LA7UDNQALABQALQAABT4BNy4BJw4BBx4BEyImNDYyHgEGAy4BNDY7ATUjIiY0NjsBMhYdATMyFhQGBwIAuPgFBfi4ufcFBfi0FyAfMB8BIV4OEREONS4NEhINURARNQ4REQ41Bfi4uPgFBfi4uPgCSSAvICAvIP57ARAaEcURGhEVEtoRGhABAAAAAAMAS//LA7UDNQALADAAOQAABT4BNy4BJw4BBx4BEyI9ATQ2Nz4BNTQmJwYHDgEjIiYnNDc+AhYXDgEHDgEdARQGByImNDYyFg4BAgC4+AUF+Li59wUF+LAkHxkeHCQfLRUKERILEwEECUl2UgIBKSEXGBIQExwcJxwBHDUF+Li4+AUF+Li4+AFTIwYhKRETIBYaHgECJg0REA8LCyAtATs4JzEVDxwTBQ4SgRopGRkpGgAAAAMAZAEuA50B0wAJABMAHQAAAQ4BFBYyNjQmJyEOARQWMjY0JichDgEUFjI2NCYnAgAjLy9GLy8j/rYkLi5HLy8jApUjLy9HLi4kAdMBL0YvL0YvAQEvRi8vRi8BAS9GLy9GLwEAAAAABgBQABMDsALsABgAIQA5AEIAWwBkAAABMjY3MzI2NCYrAS4BIgYHISIOARYzIR4BNy4BNDYyFhQGBSIGFBYXMx4BMjY3IT4CJichLgEiBgcXIiY0Nh4BFAYBPgE3MzI2NCYnIy4BIgYHIQ4BHgEzIR4BNyImNDYyHgEGApohNAyUDRMTDZQMM0Q0C/46DxMBFQ4Bxgs0IhYcHSocHP3CDRMTDZkLNEQ0CwHBDxMBFQ7+Pws0RDMMYRUdHSscHAEZIjMLlQ0TEw2VCzRDNAv+Og4VARMPAcYLNCIVHRwrHAEeAh8lHxQdFB4mJh4UHRQfJTQBHCsdHCwcshMeEwEeJiUfARMdFAEeJSUeVR0qHQEcKxz+xQElHxMeEwEfJCQfARQdEx8lNB0rHBwrHQAAAAYAUQBHA7ACuQAIABQAHQApADIAPgAAEz4BNCYOARQWNyEyNjQmJyEOARQWAzI2NCYiBhQWNyE+AS4BJyEOARQWAz4BNCYOARQWNyEyNjQmJyEOARQWhhYgIC0eHtUCSQ8TEw/9tw8TE68WICAtHh7VAkkOFQETD/23DxMTrxcfIC0eHtUCSQ8TEw/9tw8TEwJNAR8sIAEeLh4TEx4TAQETHhP+6SAsIB8uHhIBFB0TAQETHhP+6QEeLSABHi4eExMeEwEBEx4TAAAAAAMAkgClA20CWwAMABkAJgAAEz4BMyEyFhQGByEiJhU+ATchHgEUBgchLgEVPgE3IR4BFAYjISImkgEUEAKSEBQUEP1uDxYBFBACkhAUFBD9bg8WARQQApIQFBQQ/W4PFgI3DxUVHxQBFqgQFAEBFCAUAQEVqBAUAQEUHxUVAAAAAgAE/88D/AMYAB0AOwAAASMuAScOAQcGHgE2Nz4BNx4BFyMiBh8BFjI/ATYmBTMeARc+ATc2LgEGBw4BBy4BJzM+AS8BLgEPAQYWA9o4FeilX6M7CwIZGgsyiU2HwRM9FgsMXAoaCl0MC/w1OBXopV+jOwsCGBsKMIlQiMATPRYLDFwKGgpdDAsBn6HUBAFORA0dEQQMOT4BA6qGGRGEDg6DEhlYodMEAU5DDh0RBAw4PwECqoYBGBKDDgEPgxEZAAAAAAEAav+3A50DUAAzAAAJAQYuAjcBPgEXFgYHAQYuAjcBPgEmBgcBDgEXFjY3ATY0Jy4BBwEGFhceATcBNi4BBgMm/sU/kG0DPAGuJl4lIgYl/lwQIhcDDwElCgETGAr+2SABHiBTIgGmPDU1jD/+UE4ESEvDUwE9CgETGgFw/sU9BG2PQAGtJgcjJV4m/lwQBBchEQElChgTAQr+2iJVHiACIQGmPos2NAE8/lBTw0tIBE4BPQocEwEAAAAAAwAAAC8EAAKyAAsAFwAgAAAlNiQ3JiQnBgQHFgQ3LgEnPgE3HgEXDgEnMjY0JiIGFBYCAOcBFQQE/urm5f7pBAQBGORadwICd1padwICd1ogLCtBLCwvDe5HRu4NDe5GR+5iA3dZWnYCAnZaWXeELEArK0AsAAAAAQCMAK8DdAJRABAAADcGFBYyNwkBFjI2NCcBJiIHlwsWIgsBMQExCyIWC/60DCIM8QojFQsBOP7ICxUjCgFUDAwAAAABAIwArgN0AlIAEQAAJTY3ATY0JgYHCQEuAQYUFwEWAgARDAFMCxcgDP7P/s8MIBcLAUwMrgEMAVQLIBgBC/7IATgLARggDP6tDAAAAQEvAAwC0QL0ABAAACUWMjY0JwkBNjQmIgcBBhQXAo8LIhUL/sgBOAsVIgv+rAwMFwsWIQwBMQExDCEWC/60DCIMAAABAS4ADALRAvQAEQAAJTI3ATY0JwEmIgYWFwkBBhQWAVYQDAFTDAz+rQwgGAELATj+yAsWDAsBTA0hDAFLDBcgDP7P/s8LIhYAAAAAAQC7/+sDRQMVABwAAAUyNjURJx8BFjI2NCcBJiIHAQYUFjI/AgcRFBYCABEVA4BiCyAVDP7kDSAM/uMMFSALYoADFRUVEQI0XI1gChUfDQEdDQ3+4w0fFQpgjVz9zBEVAAAAAAEAu//rA0UDFQAcAAABIgYVERcvASYiBhQXARYyNwE2NCYiDwI3ETQmAgARFQOAYgsgFQwBHA0gDAEdDBUgC2KAAxUDFRUR/cxcjWAKFR8N/uMNDQEdDR8VCmCNXAI0ERUAAAABAHIAOwOOAsYAHAAAExQXARYyNjQvAhchMjY0JiMhBz8BNi4CBwEGcg0BHQ0fFQpgkWgCHhEVFRH94meQYAsBFR8O/uQNAYAQDf7kDBUgC2KDBhUiFQaDYgsgFQEO/uUNAAAAAQByADsDjgLGABwAAAE0JwEmDgEUHwInISIGFBYzITcPAQYUFjI3ATYDjg3+5A4fFQpgkWj94hEVFRECHmiRYAoVHw0BHQ0BgBANARsOARUgC2KDBhUiFQaDYgsgFQwBHA0AAAEBHgAHAtoC3wAGAAAlEyMRIxEjAfzekZuQBwEoAbD+UAAAAAQADf/3A/MDCQAZAC4ARQBbAAAFMjY1ETQmIyIGDwEGKwEmHQEUNzMyHwEeASUWNjc+ATQmJy4BDgEXHgEUBgcGFgUiLwEuASsBBj0BNDsBMjY/ATYyFREUNxY2Nz4BNCYnLgEHDgEXHgEUBgcGFgH2FhwcFw8aEckEB39bW38HBMkQGwGCDRsKKi8uKwobGQMJJCgoJAkD/oEDBL4IDgiPGRmPCA4IvgMK2gwaChocHRkKGgwOAwoTFRYSCgMJHBYCqxceDxCyBAFgq2ABBLQODlcIBg07l6aXPA0FERsPNIGQgjMOHAYEqwcFARq1GQQIrAMG/bAGcAgFDSJdZl0jDAUHCh0OGkdORxoOHAAABgA5/98D0gMiACQATABQAGIAZgByAAABNDEmLwEuAQchJgYPAgYVHgEXMzI2Nx4BNzY3HgEzMRY3PgEHBisBIiYvAQcGBwYHIiYvAQcOASsBLgE9ATQ/AjY3ITIWHwIWBgcmJwcXIwYHFSE1JicRFBYzITI2NRElJicHASEiJjQ2NyEeARQGA74BAkwLNCH95CAyC1MBCQFiSwcoRxozjjsMChpHKC4pOi+MFxkEGCoPODgGCB0mFyoPOTgQKhcGLDoFAlIFDgInBwwDTAIMHNoCAgPxAh8j/ZYnIh8XApAXH/3/AgEDAWv+PBAWFhABxBAWFgIUAQUEwR8kAQEiH8gFHB5NZwMiIDsMMAsMICEBFiF5WgwUE0RECAYYARQTREUSFQI9LgESEQXHDgEKB8MGKElrAQECCg8G4OEHEv70FxsbFwEKBwEBAgEAFR8UAQEUHxUAAAAFAED/4APAAyAACwAfADMASABdAAABISImNDYzITIWFAYDIyImNDY7ATI2PQE0NjIWHQEOAQUjLgEnNTQ2MhYdARQWOwEyFhQGAyImPQE+ATczMhYUBisBIgYdARQGISImPQE0JisBIiY0NjsBHgEXFRQGA6D8wA4SEg4DQA4SEm7ADhISDsAOEhIcEgE2/fegKTYBEhwSEg6gDhIS7g4SATYpoA4SEg6gDhISAvIOEhIOwA4SEg7AKTYBEgFgEhwSEhwS/oASHBISDqAOEhIOoCk2AQE2KaAOEhIOoA4SEhwSAiASDqApNgESHBISDqAOEhIOoA4SEhwSATYpoA4SAAAAAAEAMf/2A88DCQAgAAAFMjY9ATM2FhceATcyNjc2AicjNTQmIyIGBwEGFBcBHgEB1RYcDXunNwwbDhIZAQHV5g0cFw8aEf6uFxcBUhAbCRwWpAFQZxQNAR0c8AEQA6IWHg8Q/sQYLBj+wQ4OAAEAMf/2A88DCQAgAAAFMjY3ATY0JwEuASMiBh0BIwYCFx4BMxY2Nz4BFzMVFBYCKw8cEAFSFxf+rhIZDxccDebVAQEZEg4bCzinew0cCQ4OAT8YLBgBPBAPHheiAv7w8BwdAQ0TaFABpBYcAAQACP/nA/gDGQAbACcANQBEAAAXITY3ESYrASImLwEuASsBIgYPAQ4BKwEiBxEWJS4BJz4BNx4BFw4BEyImNTQ+ATIeARUOAQcBMj4CNC4CIw4BBx4BjwLihgEBhmQYGg0jDychqyAoDyMNGhhhhgEBAfdkgwMDg2RkgwMDg9AXHg4ZHBkOAR4W/swiPTAaGjA9IkhfAgJfGQGEAcGEDRAmEhMTEiYQDYT+P4SIA4RkZIQCAoRkZIQBUR4WDxgODhgPFh4B/u8ZMD5EPjAZAl9ISGAAAwAR/9sD7wMlACUALgA3AAATHgE7ARMeATMhMjY0JiMhLgEvASEyNj8BNjcuASMhJy4BKwEiBgEeATI2NCYiBgUUFjI2NCYiBhEBEg2RRQYyLwH0DRISDf4TEhYDBwIgLzIHIgEBARUR/UQIAxkglw0SATgBJzopKTonAZAoOygoOygDBQ0T/ikuNRIcEgEXFC01LuMKBhATNxgZE/0OHicoOignHh4nJzwnJwAAAAAEABL/2wPvAyUAJAArADQAPQAAJSEyNjQmIyEuAS8BITI2PwE2Ny4BIyEnLgErASIGFBY7ARMeAQEHDgEjIScTMjY0JiIGFBYhMjY0JiIGFBYBbgH0DRISDf4TEhYDBwIgLzIHIgEBARUR/UQIAxkglw0SEg2RRQYyAmcfAhYT/d4lexwpKTonJwGuHigoOygoqxIcEgEXFC01LuMKBhATNxgZExoT/ikuNQHRzRQX+P1fKDooJzwnJzwnJzwnAAADAEn/yQO3AzcAFAAgACwAAAEWFA8BBiIvASY0NjIfARYyPwE2MgM+ATcuAScOAQceARcuASc+ATceARcOAQLFCQn0ChkJaAkTGQo7CRkKyAoZvJvPBATPm5vPBATPm7r4BQX4urr4BQX4AhQKGQr0CQlnChkTCjoKCsgJ/fUEz5ubzwQEz5ubz00F+Lq6+AUF+Lq6+AAAAAEAS//LA7UDNQALAAAFPgE3LgEnDgEHHgECALj4BQX4uLn3BQX4NQX4uLj4BQX4uLj4AAAFAAAAFgQAAr4ACwAcAC0ANgA8AAAlFjI+AScBJg4CFwE+ATcmJCcGBxc2Mx4BFxQPATY3JwYjLgEnNDcnDgEHFgQBLgMjIgcXJx4BFzMnAyQJFxABCf2RCBgQAQkCklhgAQP+6+hfUmImKVl1AhG/aFZiKzFZdQIWgl1mAQQBFgFdAREiKxgHB4TtAkMzD4YfCREXCQJvCAEQGAj9+zt7I0bqDQEcYRECdForJO0BH2MWAnZXMyqDPH8lReoBNxgrIhEBgw8yQwGGAAAFAAAAGAQAArsACwAdAC8ANwA/AAAlFj4BNCcBJg4CFyUGBxc2Mx4BFxQGBxc+ATcmJAM2NycGBy4BJz4BNycOAQcWBCU2NS4BJwYHEzY3AQYVHgEDHwoWEQj9lgkXEAEIAUtgUDA9Q8D7BFlOLlhhAQP+7OlnVjBCS8D7BAFeUi5dZgEEARYBpBECdVgsJVExKv7rFQJ0IQkBEBcJAmoIARAXCRQBHTATDMktGWMxLjx8I0bq/ZQBHjEVAQvFMhZoMy48fyRF698mK1l0AgEQ/nMBFQEVKjJXdQAABAAAAC8EAAKxAAsAFwAjACwAACU2JDcmJCcGBAcWBDcuASc+ATceARcOASc+ATcuAScOAQceATcuATQ2MhYUBgIA5wEVBAT+6+fk/ugEBAEY5L78BAT8vr39BAT9vVp2AgJ2Wlp3AQJ2Wh4oKDwnJy8M7kdG7g0N7kZH7i8LyDMtzA0NzC0zyCkCeFhadQICdVpYeIoBJzsoKDsnAAAAAAEAg//bA30DJQAhAAAXPgE3NT4BNx4BFzI+AjcRLgEjDgEHLgEnIg4CBxEeAaQOEgEIOjBzuG0xNS0aAQEZEw9AN263dDE1LRoBARIlARIO7gQPAQVEBQsVJB0BtBETARABBUQFCxUkHf04DhIAAAACAFX/wwOrAzwAMgBAAAATDgEHFhcWBw4BFRQXFgcOARUUHgEOARUUFjsBHgEVDgEHFBYzMjY3PgE3PgE3NCYnIyIBLgEnIx4BBw4BBzM+AdwaKAEBCgQHFB0PBwsPEgkTFgsqIZkdIwRABCIaFh0MMXQzKikBrpk8VQKrAWhSTTo3AQMxHj9KYAMzBiIfGQ0JAwkkGh4TCgcIIhYPHRARHRIgLAEbGC+HPB8hHRlem0I2bkt6mwT+62OGAyt8SlF1IwKFAAAAAAMAPP+dA8QDYwAwAGkAdwAAASMiBgcOAQcWFw4BFBcOARUUFwYVHgEXMzYXDgEHHgEXMjY3PgE3Mz4BNy4BJyMuAQczHgEXFgYHDgEHDgEnIic+ATcuASsBLgE1JjY3NjQnLgE1NDc2NTQnLgE1Jjc2NTQnLgE1NDc+AQUeARcOAQcjPgE1NCYnAZ47KUIYLDMBAQQWGAoPEQ4TAT8xohEBBUAEATUsHy8UJmZMUVJrAgJ1WI0rZXY8iaICASUrMnYyDBIKIQEFQAQBMyeZFRsBCw0GBAsJHQ0DCQgBLgoCCAQvEzoBuDtSAQFJNCcYFionA2MFBgs5KBAPEC81Fw8qFyEZGygxQAIBDiWJRC04ASMoSpRbA5dwb5YDFxlBA4dvRGk5QJ5fGRABJTeGNSUpARsWDxcMBg0FDxcNHhYJCwUEERQLIhcFCgMFEhAHIQwFBTADcVRVcgItYTg8ZygAAAAAAgBV/8QDqwM9ADIAQAAABT4BNyYnJjc+ATc0JyY3PgE1NC4BPgE1NCYnIyImJz4BNzQmIyIGBw4BBw4BFRQWFzMyAR4BFzMuATc+ATcjDgEDIxsoAQEKBQgUHAEPCAwPEgoSFgsqIZkeIgEFQAQiGhYdDDF0Myoqrpk8VP1WAWhSTTo3AQMxHj9KYDMGIh8YDgkDCSQaHhMKBwgiFg8dEBEdEiArARwYL4c8HiIdGV6cQTZuTHmbBAEVY4YDK3tLUXUjAoUAAAABAFb/9wOqAwkAFwAABTI2NzYSNy4BJyIGBy4BIw4BBxYSFx4BAgAHEQe40QIDhmo9XR0dXjxqhgMC0LkHEQkHBHQBB4pzjQJANzdAAo1ziv73cgQHAAAAAwA8/50DxANjADEAagB4AAAFMzI2Nz4BNyYnPgE0Jz4BNTQmJzY1LgEnIyInPgE3LgEnIgYHDgEHIw4BBx4BFzMeATcnLgEnJjY3PgE3PgEXMhcOAQceATsBHgEVFgYHBhQXHgEVFAcGFQYXHgEVFgcGFRQXHgEVFAcOASUuASc+ATczDgEVFBYXAmI7KUIYLDMBAQQWGAoPEQcHEwE/MaIRAQVABAE1LB8vFCZmTFFSawICdViNK2V2PImiAgElKzJ2MgwSCiEBBUAEATMnmRUbAQsNBgQLCR0MAQMJCAEuCgIIBC8TOv5IO1IBAUk0JxgWKidjBQYLOSgQDxAvNhYPKhgPHgwbKDFAAg0liUQtOAEjKEqUWwOWcW+WAxcZQQECh29EaTlAnl8ZEAElNoc1JSkBGxYPFwwGDQUPFwwfFgkLBAURFAsiFwUKAwUSEAchDAUFMANxVFVyAi1hODxnKAACAFb/9wOqAwkAFgAwAAATFhIXHgEyNjc2EjcuASciBgcuASMOARc+ATceARceATI2Nz4BNx4BFw4BBwYiJy4BVgLStwcRDhEHt9ICA4ZqPV0dHV48aoZCAl9NO0oVCA4ODQkVSjtNXwIFzIsHBQaLzAIHiv76dQQHBwR1AQaKc40CMywsMwKNc1ZmAQE6IgwKCgwiOgEBZlZ67VwFBVztAAAAAAQAKP/DA9gDPQAYACEAKgAzAAAFMjY/ASEyNjURNCYnIQ4BFREUFjsBFRQWEw4BIiY0NjIWFw4BIiY0NjIWFw4BIiY0NjIWASYNFg+bASFgZGRg/dhgZGRgFBRZASU1JCM2JdcBJTQlJDUl1wEkNSQkNSQ9Dg6NZV8BSF9lAQFlX/64X2V8FRcB/xskJDUlJRobJCQ1JSUaGyQkNSUlAAACACb/mwPaA2UAIgAsAAAXAScmNwE+ATIWFwEWFA8BATY1ETYmJwEuASIGBwEOARcRFBchMjcBJiIHARYxARToDQ4BbhAYGRYRAW8HB+YBEgoBERf+pxgqLioX/qYXEQF6ArI/Gf6LGzQb/okVHwER4RALARwNDQ0N/uQFDwfh/vASLAGyIioTAQsTFhYT/vUTKiL+Ti1YFwFxGxv+jRUABQAm/5UD2gNrABMAIwApADAAOgAAFyEyNRE2JicBLgEiBgcBDgEXERQBLgEiBg8BLQE+ATIWFw0CETcXByYBERQHJzcWASIjATYyFwEiI60CpoYBGB7+tRcrLioX/rUeGQECMxYtLSwWHP7/AUIPFxsWDwFD/wD98gH28QYDMAXw9AH9EwQFASsbMhsBKgUFa4UBqi02FwEEExYWE/78FzYt/laFAZsWFBQWG/37DA0NDPz8+wG2DPTsDAHI/koRDe3xBP4BASYcHP7aAAAAAAIA1v/OAyoDMgAUABwAAAEiBgcVBhURFBYzITI2NRE0JzUuAQc+ATIWFxUhAgBdhQNFKyoBqiorRQOF/QJaiFoC/sADMoGDZwdS/rkuKysuAUhSB2aDgftaX19abwAAAAMAQf/UA74DLAAHABQAIAAABREnJicRFxYlMj8BEQYPAQYXERQWBTY/ATY1ESYnIg8BAnHUCw3YCv4MDxW0DAzLJwEaAlAGB+AlATAPFL4sAs2BBwP9KXkFCgthAtcFB3UVKv2uGBkMAQV/FSoCUzABC2kAAgFf/7oCoQNGABMAHAAABTI2NxE+ATcuAScOAQceARcRHgEDLgE0NjIWFAYCAA4ZATZCAQJaRUVaAgFDNQEZIBcfHy4fH0ZkYAGKD1U4RVsCAltFOVUO/nZgYwLgASAuHx8uIAAAAAADAGf/ywOZAzUAFQAeADgAACUyNjc1PgE3NC4CIw4BBx4BFxUeAQMiJjQ2MhYUBhM+ATcuAScVHgEXDgEHLgEnPgE3NQ4BBx4BAgAOGQE2QgEYLjsgRVoCAUM1ARkgFx8fLh8fF8TUAQjFYUSJBgKnlZWnAgaJRGHFCAHUamRfyg9VOSA7LhgCW0Q6VA/KX2QCISAuICAuIP1AA2xLV2EBQwE7MDRGAgFHNDA7AUMBYVdLbAACAEv/ywO1AzUACwAXAAAFPgE3LgEnDgEHHgETLgEnPgE3HgEXDgECALj4BQX4uLn3BQX4uDdMAQFMNzhLAQFLNQX4uLj4BQX4uLj4ASwBSzg3SwEBSzc4SwAAAAEAP/+/A8EDQQAfAAAFMjY3ATY0JiIHAQ4BFRQWHwEWNjcBNhYHAQ4BHwEeAQJXFyIMARkMGCse/R8cJCgf6BQbDgHWCQ4H/koMBAdDCRxBJR8C3R4rGAz+5QohFx0cCUYGAw0BtwcOCf4oDBwV4iEpAAAAAwAG//UD+gMLAAwAGAAsAAAXITI3ESYnISIHERYzEy4BJz4BNx4BFw4BAy4BPQE3NjMyHwE3NjIfARUUBgeNAuaGAQGG/RqGAQGGuy08AQE8LSw8AQE85h8jgx0eIB1SzSBJIMUjHwqEAgyEAYX99IUBgQE7LS08AQE8LS07/sMBIx8bchobSbYbHLZDHyIBAAAAAAQAAP/ABAADAgAOABoAIwA6AAATNDYzITU0IyEiFREUOwEXITI1ETQjISIXEQYBLgE0NjIWFAYDIiY9ATc+ATIWHwE3PgEyFh8BFQ4BI41VUwIJef21enoTrgJLenr9tXoBAQEPJzIyTDMzvhscQxokKCcaJX8fMDIxH2MBHBoB2VNUCnh4/mh3u3gBnHd3/mR4AUoBM0wzM0wz/vMdGiA+FxwcGCByHSMiHl5RGh0ABAAA/8AEAAMCABMAIQAzADwAADczFQYzITI1ETQrATU0IyEiFREUNyInETY3IRYXFSEiFxETNjMhMhcRJy4BDwEnJiMiDwE3PgE0JiIGFBZ6SAF6Akt6ekh5/bV6ezsCAjsCSTsB/jt6AT4BOwJJOwKOGkAbrkUZHBkZZdImNDRNMzN7Q3h4AZx3P3h4/mh3Pj0BkTwBATw8d/7lARc9Pf69hhcBGJo/FhZYqQE0TTQ0TTQAAgBL/8sDtQM1AAsAIAAABT4BNy4BJw4BBx4BNyImNDcTNjIXExYUBiIvASYiDwEGAgC4+AUF+Li59wUF+A4KDAOfCikJnwQMFQePBQoFjwc1Bfi4uPgFBfi4uPjVDBMIAZUZGf5rCBMMBo8GBo8GAAUAeP/EA4cDPAAIABQANQBBAEgAAAERLgEnDgEHFQEWMjY0JwEmIgYUFxMOARQWMyEyNjQmJyM1NjcnBgcuASc1NCYiBh0BHgEXFQE0JiIGBxUUBxc2NQcnFR4BFzICagFGOzlHAQHoChsTCv00ChsUCp4NExMNAZANExMNp1I7LjVLZnwCER0RAop3AUMRHBEBBTUP570BRjojAawBBj1MAQFKOgf9cgoUGgsCzAoUGwr9FwETGhMTGhMBXgcqLiMBAnxkZA8REQ9kd5oMXgHfDxERD2QZGDQvNnq9QzxNAQAAAAMAAP/4BAADBAAZAC4ARAAABTI2NRE0JiciBg8BBisBIgcVFhczMh8BHgElFjY3PgE0JicuAQ4BFx4BFAYHBhYnFjY3PgE0JicuAQcOARceARQGBwYWAdsXGxwWEBkRuwUGf1sBAVt/BgW7DxwBqwwbCiouLioKGxkDCiMnJyQJBJ4LGwoZHB0YChoMDgQLEhUVEwkDCBwWAqYWHQEPELEEYKVgAQSzDg1XCQYNO5allTwMBhEcDjOBjoEzDhxqBwUMIlxmXCINBQgKHA8ZRk1HGg4cAAAAAAIAhP+xA30DTgALAC4AAAE+ATIWFzU0JiIGFRcRBz8BPgEWFA8BBiIvASY0NjIfAScRIyYVERQ3ITInETYjAd4BExwTARQcFEUCG0EJHRILkA0aDZALEhwKXQPThoYB7IcBAYcCWA0TEw3VDhMTDrr+8T4dRQoBEhsKjAwMjAobEgtiPgEPAYX+R4UBhAG5hAAAAAADAJIApQNuAlsAAAAMAB4AABMzITIVERQjISI1ETQFNz4BHgEVERQOASYvASY9ATSSSQFuSUn+kkkCM20JFBQLCxQUCW0OAltJ/txJSQEkSYdYBgMJEgv+4gsSCQIHWAsRcBEAAgCE/5wDfQNkABoALgAAAT4BPQEnFxYyNjQvASYiDwEOARYyPwEHFRQWAyE2JxE2KwERDgEiJjURIyIVERQCAA4UAl0KGxIKkQwaDJEJAREcCl4DFOgB7IcBAYfKARkkGcuGAh4BEg6HP2MKERoJjAwMjAkaEQpkQIcOEv19AYQBmoX+zRIYGBIBM4X+ZoUAAwBF/+QDuwMcABwAKgA4AAA3MzI9AT4BNx4BFxUUOwEyNj0BLgEnIw4BBxUUFhczMjY9ATQmJyMGBxUWITMyPQE0JyMOAR0BFBZlFwsCzaqrzAILFw4SA+u+Hr7rAxKJKScrKycpKwEBAkMoLS0oKCoqjgvxm7MBAbOb8QsQDe+u0QMD0a7vDRCqKCW5JicBASv8LCz8KwEBJya5JSgAAAUAhP+vA3wDUQAfACkANgBDAE8AABsBHgEzITI2NxMzMjY0JicjNS4BKwEiBgcVIw4BFBYzNzQ2OwEyFh0BIxMuATUTPgEyFhUDDgEFLgE1AzQ2MhYVExQGNw4BIiYnET4BMhYV1RsCLSgBcigtAhwxDRISDbABMyudKjMBrw4SEg7pGBSOFBjm/gwQEgEQGBATAQ/+3gwPFBEYEBIPnAERGBABARAYEgJ0/Y4pKiopAnISHBIBPSwzMyw9ARIcEn4SFxcSPf1RARIOAfENEhIN/g4OEQEBEQ4B8g0SEg3+Dw4SIA4SEg4B8Q0SEg0AAAIAHP+5BAkDOwBBAFwAACU1MzI+AjcuAS8BNzY1LgEnIgYPAScmDgIfAQcOAQcUHgI7ARUjLgEnPgE3Jj4CFz4BNx4BFxQHHgEXDgEHBRY/ATY0JiIPATcRNCYiBhURFycmDgEUHwEWAonOFigfEAEBLiY6BgEDeFs2Xh4cMRYqIxMBATcpMwESIysZwsJRagIBUUABID5LJSd6S3ifAwE8TAECZEz+ug0MkQoSGwpdAhQcFANeChwQCpANp0UQICgWJzoJDjsKClt4AjMuKg4GCBsnFjkMC0ArGCwiEkUCa1BFZBAnRDAOCzpFAQOfeA0ND15ATGUC7QEMjAkbEApjQAFKDhMTDv62QGMLARAbCYwMAAIAHAADBAoDOwAgADwAACUVDgEmJzUhLgEnPgE3Jj4CFz4BNx4BFxQHHgEXDgEHASYPAQYUFjI/AgcVHgEyNjc1JxcWMjY0LwEmAjYBJCMB/uxQawIBUUABIT5KJiZ7S3ifAwI9SwICZUz+ugwNkAoRHAlBHQMBEx0TAQNeChsRCpEMp3sUFRUUewJrUEVkECdEMA4LOkUBA594DQ0PXkBMZQIBagEMjAkbEQtEH0C2DhMTDrZAYwsRGwmMDAAAAAIAHAAIBAoDOwA/AFoAACU1Mz4BNy4BLwE3NjUuASciBg8BJyYOAh8BBw4BFRQeAjsBFSMuASc+ATcmPgIXPgE3HgEXFAceARcOAQcBNh8BFhQGIi8BFxEOASImJxE3BwYiJjQ/ATYCis0vPgEBLiU6BQECeVo3Xh4cMRUrIxMBAjcqMxIiLBjDw1BrAgFRQAEhPkomJntLeJ8DAj1LAgJlTP66DQyRChEbCl4DARMdEwEDXgkcEQqQDadFAT4vJzoJDjsKClt4AjMuKg4GCBsnFjkMC0ArGCwiEkUCa1BFZBAnRDAOCzpFAQOfeA0ND15ATGUCAWoBDIwJGxELY0D+tg4TEw4BSkBjCxEbCYwMAAAAAAIAHP+5BAkDOwAjAD4AACU1NC4BIg4BHQEhLgEnPgE3Jj4CFz4BNx4BFxQHHgEXDgEHBRY/ATY0JiIPATc1NCYiBh0BFycmDgEUHwEWAj0MFBgUDP70UWoCAVFAASA+SyUnekt4nwMBPEwBAmRM/roNDJEKEhsKXQIUHBQDXgocEAqQDafxDBQMDBQM8QJrUEVkECdEMA4LOkUBA594DQ0PXkBMZQLtAQyMCRsQCmNATw4TEw5PQGMLARAbCYwMAAAAEgDeAAEAAAAAAAAAEwAoAAEAAAAAAAEACABOAAEAAAAAAAIABwBnAAEAAAAAAAMAFQCbAAEAAAAAAAQACADDAAEAAAAAAAUAOwFEAAEAAAAAAAYACAGSAAEAAAAAAAoAKwHzAAEAAAAAAAsAEwJHAAMAAQQJAAAAJgAAAAMAAQQJAAEAEAA8AAMAAQQJAAIADgBXAAMAAQQJAAMAKgBvAAMAAQQJAAQAEACxAAMAAQQJAAUAdgDMAAMAAQQJAAYAEAGAAAMAAQQJAAoAVgGbAAMAAQQJAAsAJgIfAEMAcgBlAGEAdABlAGQAIABiAHkAIABpAGMAbwBuAGYAbwBuAHQAAENyZWF0ZWQgYnkgaWNvbmZvbnQAAHUAbgBpAGkAYwBvAG4AcwAAdW5paWNvbnMAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAHUAbgBpAGkAYwBvAG4AcwA6AFYAZQByAHMAaQBvAG4AIAAxAC4AMAAwAAB1bmlpY29uczpWZXJzaW9uIDEuMDAAAHUAbgBpAGkAYwBvAG4AcwAAdW5paWNvbnMAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAwADsASgBhAG4AdQBhAHIAeQAgADMALAAgADIAMAAyADAAOwBGAG8AbgB0AEMAcgBlAGEAdABvAHIAIAAxADIALgAwAC4AMAAuADIANQAzADUAIAA2ADQALQBiAGkAdAAAVmVyc2lvbiAxLjAwO0phbnVhcnkgMywgMjAyMDtGb250Q3JlYXRvciAxMi4wLjAuMjUzNSA2NC1iaXQAAHUAbgBpAGkAYwBvAG4AcwAAdW5paWNvbnMAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAAAAAIAAAAAAAAACQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAhgAAAQIAAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnAA4A7wEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsBPAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAFVAVYBVwFYAVkBWgFbAVwBXQFeAV8BYAFhAWIBYwFkAWUBZgFnAWgBaQFqAWsBbAFtAW4BbwFwAXEBcgFzAXQBdQF2AXcBeAF5AXoBewF8AX0BfgF/AYABgQGCAYMHdW5pMDAwMAdjb250YWN0BnBlcnNvbglwZXJzb25hZGQNY29udGFjdGZpbGxlZAxwZXJzb25maWxsZWQPcGVyc29uYWRkZmlsbGVkBXBob25lBWVtYWlsCmNoYXRidWJibGUJY2hhdGJveGVzC3Bob25lZmlsbGVkC2VtYWlsZmlsbGVkEGNoYXRidWJibGVmaWxsZWQPY2hhdGJveGVzZmlsbGVkBXdlaWJvBndlaXhpbgtwZW5neW91cXVhbgRjaGF0AnFxCHZpZGVvY2FtBmNhbWVyYQNtaWMIbG9jYXRpb24JbWljZmlsbGVkDmxvY2F0aW9uZmlsbGVkBm1pY29mZgVpbWFnZQNtYXAHY29tcG9zZQV0cmFzaAZ1cGxvYWQIZG93bmxvYWQFY2xvc2UEcmVkbwR1bmRvB3JlZnJlc2gEc3Rhcgt3aGl0ZWNpcmNsZQVjbGVhcg1yZWZyZXNoZmlsbGVkCnN0YXJmaWxsZWQKcGx1c2ZpbGxlZAttaW51c2ZpbGxlZAxjaXJjbGVmaWxsZWQOY2hlY2tib3hmaWxsZWQKY2xvc2VlbXB0eQxyZWZyZXNoZW1wdHkGcmVsb2FkCHN0YXJoYWxmDHNwaW5uZXJjeWNsZQZzZWFyY2gJcGx1c2VtcHR5B2ZvcndhcmQEYmFjaw5jaGVja21hcmtlbXB0eQRob21lCG5hdmlnYXRlBGdlYXIKcGFwZXJwbGFuZQRpbmZvBGhlbHAGbG9ja2VkBG1vcmUEZmxhZwpob21lZmlsbGVkCmdlYXJmaWxsZWQKaW5mb2ZpbGxlZApoZWxwZmlsbGVkCm1vcmVmaWxsZWQIc2V0dGluZ3MEbGlzdARiYXJzBGxvb3AJcGFwZXJjbGlwCWV5ZWZpbGxlZAx1cHdhcmRzYXJyb3cOZG93bndhcmRzYXJyb3cObGVmdHdhcmRzYXJyb3cPcmlnaHR3YXJkc2Fycm93C2Fycm93dGhpbnVwDWFycm93dGhpbmRvd24NYXJyb3d0aGlubGVmdA5hcnJvd3RoaW5yaWdodAhwdWxsZG93bgVzb3VuZARzaG9wBHNjYW4KdW5kb2ZpbGxlZApyZWRvZmlsbGVkDGNhbWVyYWZpbGxlZApjYXJ0ZmlsbGVkBGNhcnQIY2hlY2tib3gRc21hbGxjaXJjbGVmaWxsZWQOZXllc2xhc2hmaWxsZWQIZXllc2xhc2gDZXllCmZsYWdmaWxsZWQVaGFuZHRodW1ic2Rvd25fZmlsbGVkDmhhbmR0aHVtYnNkb3duEmhhbmR0aHVtYnN1cGZpbGxlZAtoZWFydGZpbGxlZAxoYW5kdGh1bWJzdXAOYmxhY2toZWFydHN1aXQKY2hhdGZpbGxlZA5tYWlsb3BlbmZpbGxlZAhtYWlsb3Blbgxsb2NrZWRmaWxsZWQJbWFwZmlsbGVkBm1hcHBpbg1tYXBwaW5lbGxpcHNlC3NtYWxsY2lyY2xlEHBhcGVycGxhbmVmaWxsZWQLaW1hZ2VmaWxsZWQMaW1hZ2VzZmlsbGVkBmltYWdlcw5uYXZpZ2F0ZWZpbGxlZA5taWNzbGFzaGZpbGxlZAtzb3VuZGZpbGxlZA5kb3dubG9hZGZpbGxlZA52aWRlb2NhbWZpbGxlZAx1cGxvYWRmaWxsZWQKaGVhZHBob25lcwt0cmFzaGZpbGxlZA1jbG91ZGRvd25sb2FkEWNsb3VkdXBsb2FkZmlsbGVkC2Nsb3VkdXBsb2FkE2Nsb3VkZG93bmxvYWRmaWxsZWQHdW5pMDAwOQAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAQCFAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANoxE3MAAAAA2jSpUA==')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customIcons:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* #ifndef APP-NVUE */
+	@font-face {
+		font-family: uniicons;
+		src: url('./uni.ttf') format('truetype');
+	}
+
+	/* #endif */
+
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni.ttf b/uni_modules/uni-icons/components/uni-icons/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uni.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..c8e1224
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.1.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..8d56f42
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,46 @@
+
+
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+
+用于展示 icons 图标 。
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<uni-icons type="contact" size="30"></uni-icons>
+```
+
+
+
+## API
+
+### Icons Props
+
+|属性名	|类型		|默认值	|说明				|
+|:-:	|:-:		|:-:	|:-:				|
+|size	|Number		|24		|图标大小			|
+|type	|String		|-		|图标图案，参考示例	|
+|color	|String		|-		|图标颜色			|
+
+
+### Icons Events
+|事件名	|说明			|返回值|
+|:-:	|:-:			|:-:  |
+|@click|点击 Icon 触发事件|-    |
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons](https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons)
\ No newline at end of file
diff --git a/unpackage/debug/.roid.ins b/unpackage/debug/.roid.ins
new file mode 100644
index 0000000..3856a44
--- /dev/null
+++ b/unpackage/debug/.roid.ins
@@ -0,0 +1 @@
+installed
\ No newline at end of file
diff --git a/unpackage/debug/android_debug.apk b/unpackage/debug/android_debug.apk
new file mode 100644
index 0000000..69642d3
Binary files /dev/null and b/unpackage/debug/android_debug.apk differ
diff --git a/utils/qqmap-wx-jssdk.min.js b/utils/qqmap-wx-jssdk.min.js
new file mode 100644
index 0000000..2afa713
--- /dev/null
+++ b/utils/qqmap-wx-jssdk.min.js
@@ -0,0 +1,1138 @@
+var vm = ''
+
+/**
+ * 这里是重写部分
+ */
+var wx = {
+    request(obj){
+        obj.data.output = 'jsonp'
+        vm.$jsonp(obj.url,obj.data)
+        .then(json => {
+                if(json.status == 0){
+                    obj.success(json)
+                }else {
+                    obj.fail(json)
+                }
+            })
+            .catch(err => {
+                obj.fail(err)
+            })
+    }
+}
+
+var ERROR_CONF = {
+    KEY_ERR: 311,
+    KEY_ERR_MSG: 'key格式错误',
+    PARAM_ERR: 310,
+    PARAM_ERR_MSG: '请求参数信息有误',
+    SYSTEM_ERR: 600,
+    SYSTEM_ERR_MSG: '系统错误',
+    WX_ERR_CODE: 1000,
+    WX_OK_CODE: 200
+};
+var BASE_URL = 'https://apis.map.qq.com/ws/';
+var URL_SEARCH = BASE_URL + 'place/v1/search';
+var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion';
+var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/';
+var URL_CITY_LIST = BASE_URL + 'district/v1/list';
+var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren';
+var URL_DISTANCE = BASE_URL + 'distance/v1/';
+var URL_DIRECTION = BASE_URL + 'direction/v1/';
+var MODE = {
+  driving: 'driving',
+  transit: 'transit'
+};
+var EARTH_RADIUS = 6378136.49;
+var Utils = {
+  /**
+  * md5加密方法
+  * 版权所有©2011 Sebastian Tschan，https：//blueimp.net
+  */
+  safeAdd(x, y) {
+    var lsw = (x & 0xffff) + (y & 0xffff);
+    var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+    return (msw << 16) | (lsw & 0xffff);
+  },
+  bitRotateLeft(num, cnt) {
+    return (num << cnt) | (num >>> (32 - cnt));
+  },
+  md5cmn(q, a, b, x, s, t) {
+    return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b);
+  },
+  md5ff(a, b, c, d, x, s, t) {
+    return this.md5cmn((b & c) | (~b & d), a, b, x, s, t);
+  },
+  md5gg(a, b, c, d, x, s, t) {
+    return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t);
+  },
+  md5hh(a, b, c, d, x, s, t) {
+    return this.md5cmn(b ^ c ^ d, a, b, x, s, t);
+  },
+  md5ii(a, b, c, d, x, s, t) {
+    return this.md5cmn(c ^ (b | ~d), a, b, x, s, t);
+  },
+  binlMD5(x, len) {
+    /* append padding */
+    x[len >> 5] |= 0x80 << (len % 32);
+    x[((len + 64) >>> 9 << 4) + 14] = len;
+
+    var i;
+    var olda;
+    var oldb;
+    var oldc;
+    var oldd;
+    var a = 1732584193;
+    var b = -271733879;
+    var c = -1732584194;
+    var d = 271733878;
+
+    for (i = 0; i < x.length; i += 16) {
+      olda = a;
+      oldb = b;
+      oldc = c;
+      oldd = d;
+
+      a = this.md5ff(a, b, c, d, x[i], 7, -680876936);
+      d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586);
+      c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819);
+      b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330);
+      a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897);
+      d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426);
+      c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341);
+      b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983);
+      a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416);
+      d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417);
+      c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063);
+      b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162);
+      a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682);
+      d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101);
+      c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290);
+      b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329);
+
+      a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510);
+      d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632);
+      c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713);
+      b = this.md5gg(b, c, d, a, x[i], 20, -373897302);
+      a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691);
+      d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083);
+      c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335);
+      b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848);
+      a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438);
+      d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690);
+      c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961);
+      b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501);
+      a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467);
+      d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784);
+      c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473);
+      b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734);
+
+      a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558);
+      d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463);
+      c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562);
+      b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556);
+      a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060);
+      d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353);
+      c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632);
+      b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640);
+      a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174);
+      d = this.md5hh(d, a, b, c, x[i], 11, -358537222);
+      c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979);
+      b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189);
+      a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487);
+      d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835);
+      c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520);
+      b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651);
+
+      a = this.md5ii(a, b, c, d, x[i], 6, -198630844);
+      d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415);
+      c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905);
+      b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055);
+      a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571);
+      d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606);
+      c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523);
+      b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799);
+      a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359);
+      d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744);
+      c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380);
+      b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649);
+      a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070);
+      d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379);
+      c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259);
+      b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551);
+
+      a = this.safeAdd(a, olda);
+      b = this.safeAdd(b, oldb);
+      c = this.safeAdd(c, oldc);
+      d = this.safeAdd(d, oldd);
+    }
+    return [a, b, c, d];
+  },
+  binl2rstr(input) {
+    var i;
+    var output = '';
+    var length32 = input.length * 32;
+    for (i = 0; i < length32; i += 8) {
+      output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff);
+    }
+    return output;
+  },
+  rstr2binl(input) {
+    var i;
+    var output = [];
+    output[(input.length >> 2) - 1] = undefined;
+    for (i = 0; i < output.length; i += 1) {
+      output[i] = 0;
+    }
+    var length8 = input.length * 8;
+    for (i = 0; i < length8; i += 8) {
+      output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32);
+    }
+    return output;
+  },
+  rstrMD5(s) {
+    return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8));
+  },
+  rstrHMACMD5(key, data) {
+    var i;
+    var bkey = this.rstr2binl(key);
+    var ipad = [];
+    var opad = [];
+    var hash;
+    ipad[15] = opad[15] = undefined;
+    if (bkey.length > 16) {
+      bkey = this.binlMD5(bkey, key.length * 8);
+    }
+    for (i = 0; i < 16; i += 1) {
+      ipad[i] = bkey[i] ^ 0x36363636;
+      opad[i] = bkey[i] ^ 0x5c5c5c5c;
+    }
+    hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8);
+    return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128));
+  },
+  rstr2hex(input) {
+    var hexTab = '0123456789abcdef';
+    var output = '';
+    var x;
+    var i;
+    for (i = 0; i < input.length; i += 1) {
+      x = input.charCodeAt(i);
+      output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f);
+    }
+    return output;
+  },
+  str2rstrUTF8(input) {
+    return unescape(encodeURIComponent(input));
+  },
+  rawMD5(s) {
+    return this.rstrMD5(this.str2rstrUTF8(s));
+  },
+  hexMD5(s) {
+    return this.rstr2hex(this.rawMD5(s));
+  },
+  rawHMACMD5(k, d) {
+    return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d));
+  },
+  hexHMACMD5(k, d) {
+    return this.rstr2hex(this.rawHMACMD5(k, d));
+  },
+
+  md5(string, key, raw) {
+    if (!key) {
+      if (!raw) {
+        return this.hexMD5(string);
+      }
+      return this.rawMD5(string);
+    }
+    if (!raw) {
+      return this.hexHMACMD5(key, string);
+    }
+    return this.rawHMACMD5(key, string);
+  },
+  /**
+   * 得到md5加密后的sig参数
+   * @param {Object} requestParam 接口参数
+   * @param {String} sk签名字符串
+   * @param {String} featrue 方法名
+   * @return 返回加密后的sig参数
+   */
+  getSig(requestParam, sk, feature, mode) {
+    var sig = null;
+    var requestArr = [];
+    Object.keys(requestParam).sort().forEach(function(key){
+      requestArr.push(key + '=' + requestParam[key]);
+    });
+    if (feature == 'search') {
+      sig = '/ws/place/v1/search?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'suggest') {
+      sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'reverseGeocoder') {
+      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'geocoder') {
+      sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'getCityList') {
+      sig = '/ws/district/v1/list?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'getDistrictByCityId') {
+      sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'calculateDistance') {
+      sig = '/ws/distance/v1/?' + requestArr.join('&') + sk;
+    }
+    if (feature == 'direction') {
+      sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk;
+    }
+    sig = this.md5(sig);
+    return sig;
+  },
+    /**
+     * 得到终点query字符串
+     * @param {Array|String} 检索数据
+     */
+    location2query(data) {
+        if (typeof data == 'string') {
+            return data;
+        }
+        var query = '';
+        for (var i = 0; i < data.length; i++) {
+            var d = data[i];
+            if (!!query) {
+                query += ';';
+            }
+            if (d.location) {
+                query = query + d.location.lat + ',' + d.location.lng;
+            }
+            if (d.latitude && d.longitude) {
+                query = query + d.latitude + ',' + d.longitude;
+            }
+        }
+        return query;
+    },
+
+    /**
+     * 计算角度
+     */
+    rad(d) {
+      return d * Math.PI / 180.0;
+    },  
+    /**
+     * 处理终点location数组
+     * @return 返回终点数组
+     */
+    getEndLocation(location){
+      var to = location.split(';');
+      var endLocation = [];
+      for (var i = 0; i < to.length; i++) {
+        endLocation.push({
+          lat: parseFloat(to[i].split(',')[0]),
+          lng: parseFloat(to[i].split(',')[1])
+        })
+      }
+      return endLocation;
+    },
+
+    /**
+     * 计算两点间直线距离
+     * @param a 表示纬度差
+     * @param b 表示经度差
+     * @return 返回的是距离，单位m
+     */
+    getDistance(latFrom, lngFrom, latTo, lngTo) {
+      var radLatFrom = this.rad(latFrom);
+      var radLatTo = this.rad(latTo);
+      var a = radLatFrom - radLatTo;
+      var b = this.rad(lngFrom) - this.rad(lngTo);
+      var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2)));
+      distance = distance * EARTH_RADIUS;
+      distance = Math.round(distance * 10000) / 10000;
+      return parseFloat(distance.toFixed(0));
+    },
+    /**
+     * 使用微信接口进行定位
+     */
+    getWXLocation(success, fail, complete) {
+        wx.getLocation({
+            type: 'gcj02',
+            success: success,
+            fail: fail,
+            complete: complete
+        });
+    },
+
+    /**
+     * 获取location参数
+     */
+    getLocationParam(location) {
+        if (typeof location == 'string') {
+            var locationArr = location.split(',');
+            if (locationArr.length === 2) {
+                location = {
+                    latitude: location.split(',')[0],
+                    longitude: location.split(',')[1]
+                };
+            } else {
+                location = {};
+            }
+        }
+        return location;
+    },
+
+    /**
+     * 回调函数默认处理
+     */
+    polyfillParam(param) {
+        param.success = param.success || function () { };
+        param.fail = param.fail || function () { };
+        param.complete = param.complete || function () { };
+    },
+
+    /**
+     * 验证param对应的key值是否为空
+     * 
+     * @param {Object} param 接口参数
+     * @param {String} key 对应参数的key
+     */
+    checkParamKeyEmpty(param, key) {
+        if (!param[key]) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key +'参数格式有误');
+            param.fail(errconf);
+            param.complete(errconf);
+            return true;
+        }
+        return false;
+    },
+
+    /**
+     * 验证参数中是否存在检索词keyword
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkKeyword(param){
+        return !this.checkParamKeyEmpty(param, 'keyword');
+    },
+
+    /**
+     * 验证location值
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkLocation(param) {
+        var location = this.getLocationParam(param.location);
+        if (!location || !location.latitude || !location.longitude) {
+            var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误');
+            param.fail(errconf);
+            param.complete(errconf);
+            return false;
+        }
+        return true;
+    },
+
+    /**
+     * 构造错误数据结构
+     * @param {Number} errCode 错误码
+     * @param {Number} errMsg 错误描述
+     */
+    buildErrorConfig(errCode, errMsg) {
+        return {
+            status: errCode,
+            message: errMsg
+        };
+    },
+
+    /**
+     * 
+     * 数据处理函数
+     * 根据传入参数不同处理不同数据
+     * @param {String} feature 功能名称
+     * search 地点搜索
+     * suggest关键词提示
+     * reverseGeocoder逆地址解析
+     * geocoder地址解析
+     * getCityList获取城市列表：父集
+     * getDistrictByCityId获取区县列表：子集
+     * calculateDistance距离计算
+     * @param {Object} param 接口参数
+     * @param {Object} data 数据
+     */
+    handleData(param,data,feature){
+      if (feature == 'search') {
+        var searchResult = data.data;
+        var searchSimplify = [];
+        for (var i = 0; i < searchResult.length; i++) {
+          searchSimplify.push({
+            id: searchResult[i].id || null,
+            title: searchResult[i].title || null,
+            latitude: searchResult[i].location && searchResult[i].location.lat || null,
+            longitude: searchResult[i].location && searchResult[i].location.lng || null,
+            address: searchResult[i].address || null,
+            category: searchResult[i].category || null,
+            tel: searchResult[i].tel || null,
+            adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null,
+            city: searchResult[i].ad_info && searchResult[i].ad_info.city || null,
+            district: searchResult[i].ad_info && searchResult[i].ad_info.district || null,
+            province: searchResult[i].ad_info && searchResult[i].ad_info.province || null
+          })
+        }
+        param.success(data, {
+          searchResult: searchResult,
+          searchSimplify: searchSimplify
+        })
+      } else if (feature == 'suggest') {
+        var suggestResult = data.data;
+        var suggestSimplify = [];
+        for (var i = 0; i < suggestResult.length; i++) {
+          suggestSimplify.push({
+            adcode: suggestResult[i].adcode || null,
+            address: suggestResult[i].address || null,
+            category: suggestResult[i].category || null,
+            city: suggestResult[i].city || null,
+            district: suggestResult[i].district || null,
+            id: suggestResult[i].id || null,
+            latitude: suggestResult[i].location && suggestResult[i].location.lat || null,
+            longitude: suggestResult[i].location && suggestResult[i].location.lng || null,
+            province: suggestResult[i].province || null,
+            title: suggestResult[i].title || null,
+            type: suggestResult[i].type || null
+          })
+        }
+        param.success(data, {
+          suggestResult: suggestResult,
+          suggestSimplify: suggestSimplify
+          })
+      } else if (feature == 'reverseGeocoder') {
+        var reverseGeocoderResult = data.result;
+        var reverseGeocoderSimplify = {
+          address: reverseGeocoderResult.address || null,
+          latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null,
+          longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null,
+          adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null,
+          city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null,
+          district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null,
+          nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null,
+          province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null,
+          street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null,
+          street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null,
+          recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null,
+          rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null
+        };
+        if (reverseGeocoderResult.pois) {//判断是否返回周边poi
+          var pois = reverseGeocoderResult.pois;
+          var poisSimplify = [];
+          for (var i = 0;i < pois.length;i++) {
+            poisSimplify.push({
+              id: pois[i].id || null,
+              title: pois[i].title || null,
+              latitude: pois[i].location && pois[i].location.lat || null,
+              longitude: pois[i].location && pois[i].location.lng || null,
+              address: pois[i].address || null,
+              category: pois[i].category || null,
+              adcode: pois[i].ad_info && pois[i].ad_info.adcode || null,
+              city: pois[i].ad_info && pois[i].ad_info.city || null,
+              district: pois[i].ad_info && pois[i].ad_info.district || null,
+              province: pois[i].ad_info && pois[i].ad_info.province || null
+            })
+          }
+          param.success(data,{
+            reverseGeocoderResult: reverseGeocoderResult,
+            reverseGeocoderSimplify: reverseGeocoderSimplify,
+            pois: pois,
+            poisSimplify: poisSimplify
+          })
+        } else {
+          param.success(data, {
+            reverseGeocoderResult: reverseGeocoderResult,
+            reverseGeocoderSimplify: reverseGeocoderSimplify
+          })
+        }
+      } else if (feature == 'geocoder') {
+        var geocoderResult = data.result;
+        var geocoderSimplify = {
+          title: geocoderResult.title || null,
+          latitude: geocoderResult.location && geocoderResult.location.lat || null,
+          longitude: geocoderResult.location && geocoderResult.location.lng || null,
+          adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null,
+          province: geocoderResult.address_components && geocoderResult.address_components.province || null,
+          city: geocoderResult.address_components && geocoderResult.address_components.city || null,
+          district: geocoderResult.address_components && geocoderResult.address_components.district || null,
+          street: geocoderResult.address_components && geocoderResult.address_components.street || null,
+          street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null,
+          level: geocoderResult.level || null
+        };
+        param.success(data,{
+          geocoderResult: geocoderResult,
+          geocoderSimplify: geocoderSimplify
+        });
+      } else if (feature == 'getCityList') {
+        var provinceResult = data.result[0];
+        var cityResult = data.result[1];
+        var districtResult = data.result[2];
+        param.success(data,{
+          provinceResult: provinceResult,
+          cityResult: cityResult,
+          districtResult: districtResult
+        });
+      } else if (feature == 'getDistrictByCityId') {
+        var districtByCity = data.result[0];
+        param.success(data, districtByCity);
+      } else if (feature == 'calculateDistance') {
+        var calculateDistanceResult = data.result.elements;  
+        var distance = [];
+        for (var i = 0; i < calculateDistanceResult.length; i++){
+          distance.push(calculateDistanceResult[i].distance);
+        }   
+        param.success(data, {
+          calculateDistanceResult: calculateDistanceResult,
+          distance: distance
+          });
+      } else if (feature == 'direction') {
+        var direction = data.result.routes;
+        param.success(data,direction);
+      } else {
+        param.success(data);
+      }
+    },
+
+    /**
+     * 构造微信请求参数，公共属性处理
+     * 
+     * @param {Object} param 接口参数
+     * @param {Object} param 配置项
+     * @param {String} feature 方法名
+     */
+    buildWxRequestConfig(param, options, feature) {
+        var that = this;
+        options.header = { "content-type": "application/json" };
+        options.method = 'GET';
+        options.success = function (res) {
+            var data = res;
+            if (data.status === 0) {
+              that.handleData(param, data, feature);
+            } else {
+                param.fail(data);
+            }
+        };
+        options.fail = function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+        };
+        options.complete = function (res) {
+            var statusCode = +res.statusCode;
+            switch(statusCode) {
+                case ERROR_CONF.WX_ERR_CODE: {
+                    param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+                    break;
+                }
+                case ERROR_CONF.WX_OK_CODE: {
+                    var data = res.data;
+                    if (data.status === 0) {
+                        param.complete(data);
+                    } else {
+                        param.complete(that.buildErrorConfig(data.status, data.message));
+                    }
+                    break;
+                }
+                default:{
+                    param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG));
+                }
+
+            }
+        };
+        return options;
+    },
+
+    /**
+     * 处理用户参数是否传入坐标进行不同的处理
+     */
+    locationProcess(param, locationsuccess, locationfail, locationcomplete) {
+        var that = this;
+        locationfail = locationfail || function (res) {
+            res.statusCode = ERROR_CONF.WX_ERR_CODE;
+            param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+        };
+        locationcomplete = locationcomplete || function (res) {
+            if (res.statusCode == ERROR_CONF.WX_ERR_CODE) {
+                param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg));
+            }
+        };
+        if (!param.location) {
+            that.getWXLocation(locationsuccess, locationfail, locationcomplete);
+        } else if (that.checkLocation(param)) {
+            var location = Utils.getLocationParam(param.location);
+            locationsuccess(location);
+        }
+    }
+};
+
+
+class QQMapWX {
+
+    /**
+     * 构造函数
+     * 
+     * @param {Object} options 接口参数,key 为必选参数
+     */
+    constructor(options) {
+        if (!options.key) {
+            throw Error('key值不能为空');
+        }
+        vm = options.vm
+        this.key = options.key;
+    };
+
+    /**
+     * POI周边检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * @see http://lbs.qq.com/webservice_v1/guide-search.html
+     */
+    search(options) {
+        var that = this;
+        options = options || {};
+
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            orderby: options.orderby || '_distance',
+            page_size: options.page_size || 10,
+            page_index: options.page_index || 1,
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.address_format) {
+            requestParam.address_format = options.address_format;
+        }
+
+        if (options.filter) {
+            requestParam.filter = options.filter;
+        }
+
+        var distance = options.distance || "1000";
+        var auto_extend = options.auto_extend || 1;
+        var region = null;
+        var rectangle = null;
+
+        //判断城市限定参数
+        if (options.region) {
+          region = options.region;
+        }
+
+        //矩形限定坐标(暂时只支持字符串格式)
+        if (options.rectangle) {
+          rectangle = options.rectangle;
+        }
+
+        var locationsuccess = function (result) {        
+          if (region && !rectangle) {
+            //城市限定参数拼接
+            requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+          } else if (rectangle && !region) {
+            //矩形搜索
+            requestParam.boundary = "rectangle(" + rectangle + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+            } else {
+              requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")";
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'search');
+            }
+            }            
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_SEARCH,
+                data: requestParam
+            }, 'search'));
+        };
+        Utils.locationProcess(options, locationsuccess);
+    };
+
+    /**
+     * sug模糊检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-suggestion.html
+     */
+    getSuggestion(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (!Utils.checkKeyword(options)) {
+            return;
+        }
+
+        var requestParam = {
+            keyword: options.keyword,
+            region: options.region || '全国',
+            region_fix: options.region_fix || 0,
+            policy: options.policy || 0,
+            page_size: options.page_size || 10,//控制显示条数
+            page_index: options.page_index || 1,//控制页数
+            get_subpois : options.get_subpois || 0,//返回子地点
+            output: 'json',
+            key: that.key
+        };
+        //长地址
+        if (options.address_format) {
+          requestParam.address_format = options.address_format;
+        }
+        //过滤
+        if (options.filter) {
+          requestParam.filter = options.filter;
+        }
+        //排序
+        if (options.location) {
+          var locationsuccess = function (result) {
+            requestParam.location = result.latitude + ',' + result.longitude;
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
+            }
+            wx.request(Utils.buildWxRequestConfig(options, {
+              url: URL_SUGGESTION,
+              data: requestParam
+            }, "suggest"));      
+          };
+          Utils.locationProcess(options, locationsuccess);
+        } else {
+          if (options.sig) {
+            requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest');
+          }
+          wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_SUGGESTION,
+            data: requestParam
+          }, "suggest"));      
+        }        
+    };
+
+    /**
+     * 逆地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-gcoder.html
+     */
+    reverseGeocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            coord_type: options.coord_type || 5,
+            get_poi: options.get_poi || 0,
+            output: 'json',
+            key: that.key
+        };
+        if (options.poi_options) {
+            requestParam.poi_options = options.poi_options
+        }
+
+        var locationsuccess = function (result) {
+            requestParam.location = result.latitude + ',' + result.longitude;
+          if (options.sig) {
+            requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder');
+          }
+            wx.request(Utils.buildWxRequestConfig(options, {
+                url: URL_GET_GEOCODER,
+                data: requestParam
+            }, 'reverseGeocoder'));
+        };
+        Utils.locationProcess(options, locationsuccess);
+    };
+
+    /**
+     * 地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-geocoder.html
+     */
+    geocoder(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'address')) {
+            return;
+        }
+
+        var requestParam = {
+            address: options.address,
+            output: 'json',
+            key: that.key
+        };
+
+        //城市限定
+        if (options.region) {
+          requestParam.region = options.region;
+        }
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_GET_GEOCODER,
+            data: requestParam
+        },'geocoder'));
+    };
+
+
+    /**
+     * 获取城市列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getCityList(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+        var requestParam = {
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_CITY_LIST,
+            data: requestParam
+        },'getCityList'));
+    };
+
+    /**
+     * 获取对应城市ID的区县列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    getDistrictByCityId(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'id')) {
+            return;
+        }
+
+        var requestParam = {
+            id: options.id || '',
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.sig) {
+          requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId');
+        }
+
+        wx.request(Utils.buildWxRequestConfig(options, {
+            url: URL_AREA_LIST,
+            data: requestParam
+        },'getDistrictByCityId'));
+    };
+
+    /**
+     * 用于单起点到多终点的路线距离(非直线距离)计算：
+     * 支持两种距离计算方式：步行和驾车。
+     * 起点到终点最大限制直线距离10公里。
+     *
+     * 新增直线距离计算。
+     * 
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-distance.html
+     */
+    calculateDistance(options) {
+        var that = this;
+        options = options || {};
+        Utils.polyfillParam(options);
+
+        if (Utils.checkParamKeyEmpty(options, 'to')) {
+            return;
+        }
+
+        var requestParam = {
+            mode: options.mode || 'walking',
+            to: Utils.location2query(options.to),
+            output: 'json',
+            key: that.key
+        };
+
+        if (options.from) {
+          options.location = options.from;
+        }
+
+        //计算直线距离
+        if(requestParam.mode == 'straight'){        
+          var locationsuccess = function (result) {
+            var locationTo = Utils.getEndLocation(requestParam.to);//处理终点坐标
+            var data = {
+              message:"query ok",
+              result:{
+                elements:[]
+              },
+              status:0
+            };
+            for (var i = 0; i < locationTo.length; i++) {
+              data.result.elements.push({//将坐标存入
+                distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng),
+                duration:0,
+                from:{
+                  lat: result.latitude,
+                  lng:result.longitude
+                },
+                to:{
+                  lat: locationTo[i].lat,
+                  lng: locationTo[i].lng
+                }
+              });            
+            }
+            var calculateResult = data.result.elements;
+            var distanceResult = [];
+            for (var i = 0; i < calculateResult.length; i++) {
+              distanceResult.push(calculateResult[i].distance);
+            }  
+            return options.success(data,{
+              calculateResult: calculateResult,
+              distanceResult: distanceResult
+            });
+          };
+          
+          Utils.locationProcess(options, locationsuccess);
+        } else {
+          var locationsuccess = function (result) {
+            requestParam.from = result.latitude + ',' + result.longitude;
+            if (options.sig) {
+              requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance');
+            }
+            wx.request(Utils.buildWxRequestConfig(options, {
+              url: URL_DISTANCE,
+              data: requestParam
+            },'calculateDistance'));
+          };
+
+          Utils.locationProcess(options, locationsuccess);
+        }      
+    };
+
+  /**
+   * 路线规划：
+   * 
+   * @param {Object} options 接口参数对象
+   * 
+   * 请求参数结构可以参考
+   * https://lbs.qq.com/webservice_v1/guide-road.html
+   */
+  direction(options) {
+    var that = this;
+    options = options || {};
+    Utils.polyfillParam(options);
+
+    if (Utils.checkParamKeyEmpty(options, 'to')) {
+      return;
+    }
+
+    var requestParam = {
+      output: 'json',
+      key: that.key
+    };
+
+    //to格式处理
+    if (typeof options.to == 'string') {
+      requestParam.to = options.to;
+    } else {
+      requestParam.to = options.to.latitude + ',' + options.to.longitude;
+    }
+    //初始化局部请求域名
+    var SET_URL_DIRECTION = null;
+    //设置默认mode属性
+    options.mode = options.mode || MODE.driving;
+
+    //设置请求域名
+    SET_URL_DIRECTION = URL_DIRECTION + options.mode;
+
+    if (options.from) {
+      options.location = options.from;
+    }
+
+    if (options.mode == MODE.driving) {
+      if (options.from_poi) {
+        requestParam.from_poi = options.from_poi;
+      }
+      if (options.heading) {
+        requestParam.heading = options.heading;
+      }
+      if (options.speed) {
+        requestParam.speed = options.speed;
+      }
+      if (options.accuracy) {
+        requestParam.accuracy = options.accuracy;
+      }
+      if (options.road_type) {
+        requestParam.road_type = options.road_type;
+      }
+      if (options.to_poi) {
+        requestParam.to_poi = options.to_poi;
+      }
+      if (options.from_track) {
+        requestParam.from_track = options.from_track;
+      }
+      if (options.waypoints) {
+        requestParam.waypoints = options.waypoints;
+      }
+      if (options.policy) {
+        requestParam.policy = options.policy;
+      }
+      if (options.plate_number) {
+        requestParam.plate_number = options.plate_number;
+      }
+    }
+
+    if (options.mode == MODE.transit) {
+      if (options.departure_time) {
+        requestParam.departure_time = options.departure_time;
+      }
+      if (options.policy) {
+        requestParam.policy = options.policy;
+      }
+    } 
+
+    var locationsuccess = function (result) {
+      requestParam.from = result.latitude + ',' + result.longitude;
+      if (options.sig) {
+        requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction',options.mode);
+      }
+      wx.request(Utils.buildWxRequestConfig(options, {
+        url: SET_URL_DIRECTION,
+        data: requestParam
+      }, 'direction'));
+    };
+
+    Utils.locationProcess(options, locationsuccess);
+  }
+};
+
+module.exports = QQMapWX;
\ No newline at end of file