diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js
index f39f854..69321b3 100644
--- a/apis/interfaces/auth.js
+++ b/apis/interfaces/auth.js
@@ -1,35 +1,35 @@
-
+
 /**
  * 手太欠
  * 愿这世界都如故事里一样 美好而动人~
- */
-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
-	})
+ */
+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
+	})
 }
 
 // 注册
@@ -39,31 +39,39 @@ const register = (data) => {
 		method: 'POST',
 		data: data
 	})
-}
-
-// 领取红包-发送短信-获取验证码
-const send = (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
+	})
+}
+
+// 获取短信前图形验证码
+const Captcha = () =>{
 	return request({
-		url: 'sms/send',
-		method: 'POST',
-		data: data
+		url: "auth/captcha",
 	})
-}
-
-// 领取红包-领取
-const unicom = (data) => {
-	return request({
-		url: 'unicom/get',
-		method: 'POST',
-		data: data
-	})
-}
-
-export {
-	auth,
-    passSetup,
+}
+
+export {
+	auth,
+    passSetup,
     passlogin,
-	register,
-    send,
-    unicom
-}
+	register,
+    send,
+    unicom,
+	Captcha
+}
diff --git a/apis/interfaces/rights.js b/apis/interfaces/rights.js
index 5126b35..e04c015 100644
--- a/apis/interfaces/rights.js
+++ b/apis/interfaces/rights.js
@@ -1,143 +1,153 @@
-
+
 /**
  * 手太欠
  * 愿这世界都如故事里一样 美好而动人~
- */
-
-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
+ */
+
+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
+    })
+}
+
+
+// h5掉起微信授权的前置获取相关的签名信息前置
+const cjsubscribeUrl = (data) => {
+    return request({
+        url: 'auth/cjjssdk',
+        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,
+	cjsubscribeUrl,
+    unionpay,
+    unionCode,
+    rightsSingle,
+    h5Pay
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3f68868..b93120a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -82,9 +82,10 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+                "desc" : "测试"
             }
-        }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress", "chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages/business/business.vue b/pages/business/business.vue
index 4c2676d..a01a178 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -3,14 +3,14 @@
 		<view class="pack-center pages-hint showActive" v-if="showDt">
 			<image src="/static/img/null_icon.png"></image>
 			<view>查看附近营业厅，需要获取您的地理位置</view>
-			<!-- <button class="location-btn" size="mini" open-type="openSetting">
+			<!-- <button class="showActive-go" size="mini" open-type="openSetting">
 				开启定位服务
 			</button> -->
-			<view class="showActive-go" @tap="showTap">获取</view>
+			<view class="showActive-go" @tap="openSetting">获取</view>
 		</view>
         <view class="showDt" v-else>
         	<view class="top">
-        	    <view class="top-left nowrap">{{locationData.address}}</view>
+        	    <view class="top-left nowrap">{{locatResaa}}</view>
         		<view class="top-picker">
         		    <picker @change="screenOrders" :value="ordersIndex" :range-key="'name'" :range="ordersWay">
         		        {{ ordersWay[ordersIndex].name }}
@@ -23,8 +23,11 @@
         			<image :src="item.cover" mode="aspectFill" class="item-logo"></image>
         			<view class="item-cont">
         				<view class="item-name nowrap">{{item.title}}</view>
-        				<view class="item-address nowrap">{{item.address}}</view>
-        				<view class="item-distance nowrap">
+        				<view class="item-address">
+							<view class="item-address-tel">{{item.address}}</view>
+							<image @tap="tel(item.mobile)" src="/static/icon/tel.png"></image>
+						</view>
+        				<view class="item-distance">
         					<view class="item-distance-left">{{item.distance}}</view>
         					<view class="item-distance-go" @tap="siteMap(item.latitude, item.longitude)">去导航</view>
         				</view>
@@ -41,13 +44,18 @@
         </view>
     </view>
 </template>
-
+
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 <script>
 	import { hallsIndex } from '@/apis/interfaces/index'
+	import { cjsubscribeUrl } from '@/apis/interfaces/rights'
+	import wx from 'weixin-js-sdk'
     import QQMapWX from '@/utils/qqmap-wx-jssdk.min.js'
+	
     export default {
     	data() {
     		return {
+				locatResaa      : '',
 				showDt       : false,
                 latitude     : '',
 				longitude    : '',
@@ -72,32 +80,57 @@
 			if(this.latitude == '') {
 				this.showDt = true
 			}
-            
         },
-        onShow() {},
+        onShow() {
+			// 获取营业厅列表
+			this.regilist();
+		},
         methods:{
-			showTap() {
-				this.showDt = false
+			openSetting() {
 				// 获取定位 - 使用腾讯地图sdk
-				uni.getLocation({
-				    success: res => {
-				        // 调用接口
-				        this.qqMap.reverseGeocoder({
-				            location: {
-				                latitude: res.latitude,
-				                longitude: res.longitude
-				            },
-				            success: locatRes => {
-				                this.latitude = locatRes.result.location.lat
-				                this.longitude = locatRes.result.location.lng
-								
+				cjsubscribeUrl({
+				    url: location.href.split('#')[0]
+				}).then(wechatConfig => {
+					let wxConfig = JSON.parse(wechatConfig)
+					console.log(wxConfig)
+					wx.config({
+					    appId: wxConfig.appId,
+						jsApiList : ['scanQRCode','closeWindow','chooseWXPay','getLocation'],
+					    debug: false,
+					    signature: wxConfig.signature,
+					    nonceStr: wxConfig.nonceStr,
+					    timestamp: wxConfig.timestamp,
+						openTagList	: wxConfig.openTagList
+					})
+					wx.ready(() => {
+						  wx.getLocation({
+							type: 'gcj02', //返回可以用于wx.openLocation的经纬度
+							success: res=> {
+								// 调用接口
+								this.qqMap.reverseGeocoder({
+									location: {
+										latitude: res.latitude,
+										longitude: res.longitude
+									},
+									success: locatRes => {
+										this.locatResaa= locatRes.result.formatted_addresses.recommend
+										this.latitude  = locatRes.result.location.lat
+										this.longitude = locatRes.result.location.lng
+										
+										this.showDt = false
+										// 获取营业厅列表
+										this.regilist();
+									},
+									fail: res => {},
+									complete: res => {}
+								});
+							},
+							cancel: res=> {
 								// 获取营业厅列表
-								this.regilist(this.latitude, this.longitude);
-				            },
-				            fail: res => {},
-				            complete: res => {}
-				        });
-				    }
+								this.regilist();
+							}
+						})
+					})
 				})
 			},
 			
@@ -129,6 +162,7 @@
 					this.page         = res.halls.page
 					this.lodingStats  = false
 					uni.stopPullDownRefresh()
+					
                 })
             },
 			
@@ -165,7 +199,21 @@
 					
 				window.location.href = "http://uri.amap.com/marker?position="+ longitude +","+latitude +"&name="+ name +"&coordinate=gaode&callnative=1";
 				
-			}
+			},
+			
+			// 拨打电话
+			tel(e) {
+			    uni.showActionSheet({
+			        itemList    : ['呼叫商家电话'],
+			        success     : res =>{
+			            if(res.tapIndex==0){
+			                uni.makePhoneCall({
+			                    phoneNumber: e
+			                })
+			            }
+			        }
+			    })
+			},
         }
     }
 </script>
@@ -231,7 +279,7 @@
 		box-sizing: border-box;
 		border-radius: 10rpx;
 		margin-bottom: 30rpx;
-		position: relative;
+		display: flex;
 	}
 	.item-logo {
 		width: 180rpx;
@@ -239,11 +287,8 @@
 		border-radius: 10rpx;
 	}
 	.item-cont {
-		width: 100%;
-		position: absolute;
-		left: 0;
-		top: 0;
-		padding: 30rpx 30rpx 30rpx 240rpx;
+		width: calc(100% - 180rpx);
+		padding-left: 30rpx;
 		box-sizing: border-box;
 	}
 	
@@ -253,6 +298,15 @@
 	}
 	.item-address {
 		margin: 10rpx 0 30rpx;
+		display: flex;
+	}
+	.item-address image {
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 20rpx;
+	}
+	.item-address-tel {
+		width: calc(100% - 64rpx);
 	}
 	.item-distance {
 		display: flex;
diff --git a/pages/campus/index.vue b/pages/campus/index.vue
index 082f1af..5e668bf 100644
--- a/pages/campus/index.vue
+++ b/pages/campus/index.vue
@@ -31,7 +31,7 @@
 			</view>
 			
 			<!-- 39元套餐包年兑换480元消费金 -->
-			<view class="film">
+			<view class="film" v-if="filmData.length > 0">
 			    <view class="filmTitle">
 			        39元套餐包年兑换480元消费金
 			    </view>
@@ -54,7 +54,7 @@
 			</view>
 			
 			<!--  59元套餐包年兑换720元消费金 -->
-			<view class="film">
+			<view class="film" v-if="bathData.length > 0">
 			    <view class="filmTitle">
 			        59元套餐包年兑换720元消费金
 			    </view>
@@ -77,7 +77,7 @@
 			</view>
 			
 			<!-- 云盘套餐包年兑换180元消费金 -->
-			<view class="film">
+			<view class="film" v-if="marketData.length > 0">
 			    <view class="filmTitle">
 			        云盘套餐包年兑换180元消费金
 			    </view>
@@ -100,7 +100,7 @@
 			</view>
 			
 			<!-- 99元套餐包年兑换960元消费金 -->
-			<view class="film">
+			<view class="film" v-if="repastData.length > 0">
 			    <view class="filmTitle">
 			        99元套餐包年兑换960元消费金
 			    </view>
diff --git a/pages/campus/password.vue b/pages/campus/password.vue
index 86afc02..123ba02 100644
--- a/pages/campus/password.vue
+++ b/pages/campus/password.vue
@@ -2,7 +2,7 @@
     <view class="content">
 		<view class="campus-header">
 			<view class="logo">
-				<image src="/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<image src="/static/img/campusRedLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">身份验证</view>
 			</view>
 			<image class="cover" src="/static/img/campus_nologo.png" mode="aspectFill"></image>
diff --git a/pages/campus/register.vue b/pages/campus/register.vue
index e0d8f8d..2c2aa60 100644
--- a/pages/campus/register.vue
+++ b/pages/campus/register.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="campus-header">
 			<view class="logo">
-				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<image src="@/static/img/campusRedLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">用户注册</view>
 			</view>
 			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
diff --git a/pages/campus/setPassword.vue b/pages/campus/setPassword.vue
index eab1e0b..62a7f8d 100644
--- a/pages/campus/setPassword.vue
+++ b/pages/campus/setPassword.vue
@@ -2,7 +2,7 @@
     <view class="content">
 		<view class="campus-header">
 			<view class="logo">
-				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<image src="@/static/img/campusRedLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">设置新密码</view>
 			</view>
 			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
diff --git a/pages/campus/signin.vue b/pages/campus/signin.vue
index 5f346a7..85cfa5a 100644
--- a/pages/campus/signin.vue
+++ b/pages/campus/signin.vue
@@ -2,7 +2,7 @@
     <view class="content">
 		<view class="campus-header">
 			<view class="logo">
-				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
+				<image src="@/static/img/campusRedLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">消费金兑换活动登录</view>
 			</view>
 			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
diff --git a/pages/couponDetails/couponDetails.vue b/pages/couponDetails/couponDetails.vue
index f241f18..330de6d 100644
--- a/pages/couponDetails/couponDetails.vue
+++ b/pages/couponDetails/couponDetails.vue
@@ -1,387 +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>
+<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>
+    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 : '',  // 纬度
+                    longitude: ''   // 经度
+                }
+            }
+        },
+        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 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/giftPack/index.vue b/pages/giftPack/index.vue
index fb73b13..9503fcc 100644
--- a/pages/giftPack/index.vue
+++ b/pages/giftPack/index.vue
@@ -379,7 +379,8 @@
 
 <style lang="scss" scoped>
     .content {
-        background: linear-gradient(to bottom, #fff9f9, #fff9f9);
+		background: linear-gradient(to bottom, #fdf5cc, #cbaf7f);
+        // background: linear-gradient(to bottom, #fff9f9, #fff9f9);
         padding-bottom: 40rpx;
 		height: 100vh;
 		overflow-y: scroll;
@@ -459,17 +460,19 @@
 		padding: 0 0 30rpx;
 	}
     .filmTitle {
-        background: linear-gradient(to right, #fce1d6, #fce1d6);
+        // background: linear-gradient(to right, #fce1d6, #fce1d6);
+		 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: #ea7e4d;
+        color: #a47d53;
         margin: 0 20rpx;
     }
     .filmList {
         position: relative;
-        background: linear-gradient(to right, #f1824a, #fdbe71);
+        // background: linear-gradient(to right, #f1824a, #fdbe71);
+		background: linear-gradient(to right, #494e75, #27314d);
         box-shadow: 0px 6px 10px rgba(134,97,33,.1);
         border-radius: 10rpx;
         padding: 50rpx 30rpx 30rpx;
@@ -535,7 +538,7 @@
             .filmList-top-name {
                 width: calc(100% - 140rpx);
                 margin-right: 20rpx;
-                color: #fff6f6;
+                color: #fce2ae;
                 font-size: 32rpx;
     			margin-top: 10rpx;
                 text {
@@ -546,11 +549,13 @@
             }
             .filmList-top-price {
     			position: relative;
-                background: linear-gradient(to right, #fff9f9, #fff9f9);
+                // background: linear-gradient(to right, #fff9f9, #fff9f9);
+				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: #fa803f;
+                color: #FFFFFF;
                 text-align: center;
                 padding-top: 20rpx;
                 font-size: 30rpx;
@@ -563,7 +568,7 @@
                 }
     			.filmList-tag{
     				position: absolute;
-    				background: #ff0000;
+    				background: #474d73;
     				color: white;
     				font-size: 20rpx;
     				top: -10%;
@@ -587,7 +592,7 @@
         }
 		.filmList-tips {
 			font-size: 24rpx;
-			color: #ffedc8;
+			color: #c1c1c1;
 			margin-top: 30rpx;
 		}
     }
@@ -720,7 +725,7 @@
 				color: #abaeb2;
 			}
 			&.active .campusBtn-name {
-				color: #f55249;
+				color: #474d73;
 			}
 		}
     }
@@ -747,10 +752,10 @@
 				border-radius: 40rpx;
 			}
 			&.active::after {
-				background-color: #f55249;
+				background-color: #474d73;
 			}
 			&.active {
-				color: #f55249;
+				color: #474d73;
 				font-weight: 600;
 			}
 			.indexTab-title,
@@ -831,7 +836,7 @@
 	
 	.tipsWhite-name {
 		text-align: center;
-		color: #f55249;
+		color: #474d73;
 		font-size: 34rpx;
 		font-weight: 600;
 		margin-bottom: 15rpx;
diff --git a/pages/giftPack/logs.vue b/pages/giftPack/logs.vue
index 8d302ba..910918e 100644
--- a/pages/giftPack/logs.vue
+++ b/pages/giftPack/logs.vue
@@ -156,7 +156,7 @@
 			position: relative;
 			width: 440rpx;
 			margin: 0 auto;
-			color: #f25448;
+			color: #27314d;
 			line-height: 60rpx;
 			&::after,
 			&::before {
@@ -181,7 +181,8 @@
 	}
 	
 	.redBack {
-		background-image: linear-gradient(to top, #fe796f, #f25549);
+		// background-image: linear-gradient(to top, #fe796f, #f25549);
+		background-image: linear-gradient(to top, #494e75, #27314d);
 		border-radius: 30rpx;
 		padding: 30rpx 0 40rpx;
 		box-sizing: border-box;
@@ -196,7 +197,7 @@
 		border-radius: 0 0 20rpx 20rpx;
 	}
 	.redBack::after {
-		background-color: rgba(243, 85, 73, .4);
+		background-color: rgba(39,49,77,.4);
 		z-index: 2;
 		width: calc(100% - 40rpx);
 		left: 20rpx;
@@ -204,7 +205,7 @@
 		height: 14px;
 	}
 	.redBack::before {
-		background-color: rgba(243, 85, 73, .2);
+		background-color: rgba(39,49,77,.4);
 		z-index: 1;
 		width: calc(100% - 80rpx);
 		left: 40rpx;
@@ -305,7 +306,7 @@
 				position: absolute;
 				top: 50rpx;
 				right: 30rpx;
-				color: #f25448;
+				color: #27314d;
 				font-size: 38rpx;
 			}
 		}
diff --git a/pages/giftPack/password.vue b/pages/giftPack/password.vue
index 632314e..47f4459 100644
--- a/pages/giftPack/password.vue
+++ b/pages/giftPack/password.vue
@@ -5,7 +5,8 @@
 				<image src="/static/img/campusLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">身份验证</view>
 			</view>
-			<image class="cover" src="/static/img/campusLogin_back_red.png" mode="aspectFill"></image>
+			<!-- <image class="cover" src="/static/img/campusLogin_back_red.png" mode="aspectFill"></image> -->
+			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
 		</view>
         <view class="campus-cont">
             <form @submit="forgetlogin">
@@ -121,8 +122,8 @@
 <style lang="scss">
 	.content{
 		min-height: 100vh;
-		// background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
-		background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+		// background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
 	}
 	.campus-cont{
 		padding: 40rpx 60rpx;
@@ -130,8 +131,8 @@
 			position: relative;
 			padding-left: 30rpx;
 			padding-right: 30rpx;
-			background-image: linear-gradient(to right, #f4eeee, #f4eeee);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f4eeee, #f4eeee);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			height: 90rpx;
 			line-height: 90rpx;
 			border-radius: 45rpx;
@@ -149,12 +150,14 @@
 					font-size: 30rpx;
 					height: 90rpx;
 					line-height: 90rpx;
-					color: #f25448;
+					color: #ffffff;
+					// color: #f25448;
 					&::after{
 						border: none;
 					}
 					&[disabled]{
-						color: rgba($color: #f25448, $alpha: .5);
+						color: rgba($color: #ffffff, $alpha: .5);
+						// color: rgba($color: #f25448, $alpha: .5);
 					}
 				}
 			}
@@ -184,8 +187,8 @@
 			line-height: 90rpx;
 			padding: 0;
 			border-radius: 45rpx;
-			background-image: linear-gradient(to right, #f25448, #fe786d);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f25448, #fe786d);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			font-size: 32rpx;
 			color: white;
 		}
diff --git a/pages/giftPack/register.vue b/pages/giftPack/register.vue
index d77980b..43cdda4 100644
--- a/pages/giftPack/register.vue
+++ b/pages/giftPack/register.vue
@@ -5,7 +5,8 @@
 				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">联通全额消费金活动用户注册</view>
 			</view>
-			<image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image>
+			<!-- <image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image> -->
+			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
 		</view>
 	    <view class="campus-cont">
 	        <form @submit="submitRegister">
@@ -132,8 +133,8 @@
 <style lang="scss">
 	.content{
 		min-height: 100vh;
-		// background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
-		background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+		// background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
 	}
 	.campus-cont{
 		padding: 40rpx 60rpx;
@@ -142,8 +143,8 @@
 			position: relative;
 			padding-left: 30rpx;
 			padding-right: 30rpx;
-			background-image: linear-gradient(to right, #f4eeee, #f4eeee);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f4eeee, #f4eeee);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			height: 90rpx;
 			line-height: 90rpx;
 			border-radius: 45rpx;
@@ -161,12 +162,14 @@
 					font-size: 30rpx;
 					height: 90rpx;
 					line-height: 90rpx;
-					color: #f25448;
+					color: #ffffff;
+					// color: #f25448;
 					&::after{
 						border: none;
 					}
 					&[disabled]{
-						color: rgba($color: #f25448, $alpha: .5);
+						color: rgba($color: #ffffff, $alpha: .5);
+						// color: rgba($color: #f25448, $alpha: .5);
 					}
 				}
 			}
@@ -191,8 +194,8 @@
 			line-height: 90rpx;
 			padding: 0;
 			border-radius: 45rpx;
-			background-image: linear-gradient(to right, #f25448, #fe786d);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f25448, #fe786d);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			font-size: 32rpx;
 			color: white;
 		}
diff --git a/pages/giftPack/setPassword.vue b/pages/giftPack/setPassword.vue
index eaf07ed..b5207a8 100644
--- a/pages/giftPack/setPassword.vue
+++ b/pages/giftPack/setPassword.vue
@@ -5,7 +5,8 @@
 				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">设置新密码</view>
 			</view>
-			<image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image>
+			<!-- <image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image> -->
+			<image class="cover" src="@/static/img/campus_nologo.png" mode="aspectFill"></image>
 		</view>
         <view class="campus-cont">
             <form @submit="forgetlogin">
@@ -59,8 +60,8 @@
 <style lang="scss">
 	.content{
 		min-height: 100vh;
-		// background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
-		background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+		// background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
 	}
 	.campus-cont{
 		padding: 40rpx 60rpx;
@@ -68,8 +69,8 @@
 			position: relative;
 			padding-left: 30rpx;
 			padding-right: 30rpx;
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
-			background-image: linear-gradient(to right, #f4eeee, #f4eeee);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f4eeee, #f4eeee);
 			height: 90rpx;
 			line-height: 90rpx;
 			border-radius: 45rpx;
@@ -87,12 +88,14 @@
 					font-size: 30rpx;
 					height: 90rpx;
 					line-height: 90rpx;
-					color: #f25448;
+					color: #ffffff;
+					// color: #f25448;
 					&::after{
 						border: none;
 					}
 					&[disabled]{
-						color: rgba($color: #f25448, $alpha: .5);
+						color: rgba($color: #ffffff, $alpha: .5);
+						// color: rgba($color: #f25448, $alpha: .5);
 					}
 				}
 			}
@@ -122,8 +125,8 @@
 			line-height: 90rpx;
 			padding: 0;
 			border-radius: 45rpx;
-			background-image: linear-gradient(to right, #f25448, #fe786d);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f25448, #fe786d);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			font-size: 32rpx;
 			color: white;
 		}
diff --git a/pages/giftPack/signin.vue b/pages/giftPack/signin.vue
index 81d86fa..eff5890 100644
--- a/pages/giftPack/signin.vue
+++ b/pages/giftPack/signin.vue
@@ -5,13 +5,14 @@
 				<image src="@/static/img/campusLogin_logo.png" mode="aspectFill"></image>
 				<view class="title">联通全额消费金活动登录</view>
 			</view>
-			<image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image>
+			<!-- <image class="cover" src="@/static/img/campusLogin_back_red.png" mode="aspectFill"></image> -->
+			<image class="cover" src="@/static/img/campus_nologo.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>
+				    <input class="campus-form-input" type="number" maxlength="11" 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> -->
@@ -21,7 +22,15 @@
 				<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>
+				
+				<!-- <view class="captcha-inputs">
+					<view class="captcha-campus-inputs campus-inputs">
+					    <input class="campus-form-input" type="text" placeholder="请输入图文验证码" name="captcha" @input="getCaptchaValue"></input>
+					</view>
+					<image class="campus-form-graph" :src="captchaImg" mode="widthFix" @click="campusClick"></image>
+				</view> -->
+				
 				<view class="resPassword">
 					<navigator url="password">忘记密码</navigator>
 				</view>
@@ -36,7 +45,7 @@
 </template>
 
 <script>
-    import { send, auth, passlogin } from '@/apis/interfaces/auth'
+    import { send, auth, passlogin, Captcha } from '@/apis/interfaces/auth'
     export default {
         data() {
             return {
@@ -45,10 +54,38 @@
                 code         : '',   // 验证码
 				passwordLogin: true, // 登录方式
                 disabled     : false,
+				captcha      : '',  // 输入图形码
+				captchaImg   : '',  // 图形码
+				captchaKey   : ''
             }
         },
+		
+		// 生命周期函数--监听页面显示
+		onShow() {
+			// 获取图形码
+			this.captchaInfo()
+		},
         
-        methods: {
+        methods: {
+			// 图形码
+			captchaInfo() {
+				Captcha().then(res=>{
+					this.captchaImg = res.img
+					this.captchaKey = res.key
+				}).catch(err=>{
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			
+			// 重新获取图形码
+			campusClick() {
+				// 获取图形码
+				this.captchaInfo()
+			},
+			
 			// 切换登录方式
 			onCutLogin(){
 				this.passwordLogin = !this.passwordLogin
@@ -57,6 +94,11 @@
             getNameValue(e) {
                 this.mobileNo = e.detail.value
             },
+			
+			// captcha
+			getCaptchaValue(e) {
+			    this.captcha = e.detail.value
+			},
             
             // 获取code
             getCode(){
@@ -116,18 +158,24 @@
             forgetlogin(e){
                 let mobileNo = e.detail.value.mobile || '',
                     code     = this.code || '',
-					password = e.detail.value.password || '',
+					password = e.detail.value.password || '',
+					captchakey = this.captchaKey,
+					captcha  = this.captcha || '',
 					loginFunction
 				
 				if(this.passwordLogin){
 					loginFunction = passlogin({
 						mobile	: mobileNo,
-						password: password
+						password: password,
+						captcha : captcha,
+						captcha_key: captchakey
 					})
-				}else{
+				}else{
 					loginFunction = auth({
 						mobile: mobileNo,
-						code: code,
+						code: code,
+						captcha : captcha,
+						captcha_key: captchakey,
 						type: ''
 					})
 				}
@@ -137,7 +185,10 @@
 					uni.reLaunch({
 					    url: '/pages/giftPack/index'
 					})
-				}).catch(err =>{
+				}).catch(err =>{
+					// 获取图形码
+					this.captchaInfo()
+					
 					uni.showToast({
 						title: err.message,
 						icon : 'none'
@@ -151,9 +202,10 @@
 <style lang="scss" scoped>
 	.content{
 		min-height: 100vh;
-		background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
-		// background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
-	}
+		// background-image: linear-gradient(to top right, #fff9f9, #fff9f9);
+		background-image: linear-gradient(to top right, #cbaf7f, #fcf4cb);
+	}
+	
 	.campus-cont{
 		padding: 40rpx 60rpx;
 		.campus-inputs{
@@ -161,8 +213,8 @@
 			padding-left: 30rpx;
 			// padding-left: 90rpx;
 			padding-right: 30rpx;
-			background-image: linear-gradient(to right, #f4eeee, #f4eeee);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f4eeee, #f4eeee);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			height: 90rpx;
 			line-height: 90rpx;
 			border-radius: 45rpx;
@@ -180,12 +232,14 @@
 					font-size: 30rpx;
 					height: 90rpx;
 					line-height: 90rpx;
-					color: #f25448;
+					color: #ffffff;
+					// color: #f25448;
 					&::after{
 						border: none;
 					}
 					&[disabled]{
-						color: rgba($color: #f25448, $alpha: .5);
+						// color: rgba($color: #f25448, $alpha: .5);
+						color: rgba($color: #ffffff, $alpha: .5);
 					}
 				}
 			}
@@ -199,7 +253,8 @@
 		}
 		.campus-form-input{
 			height: 90rpx;
-			color: #000000;
+			color: #ffffff;
+			// color: #000000;
 			font-size: 32rpx;
 		}
 		
@@ -218,8 +273,8 @@
 			line-height: 90rpx;
 			padding: 0;
 			border-radius: 45rpx;
-			background-image: linear-gradient(to right, #f25448, #fe786d);
-			// background-image: linear-gradient(to right, #575a85, #252f4b);
+			// background-image: linear-gradient(to right, #f25448, #fe786d);
+			background-image: linear-gradient(to right, #575a85, #252f4b);
 			font-size: 32rpx;
 			color: #ffffff;
 		}
@@ -265,5 +320,18 @@
 				font-size: 40rpx;
 			}
 		}
-	}
+	}
+	
+	.captcha-inputs {
+		display: flex;
+		.campus-form-graph {
+			width: 220rpx;
+			margin-top: 10rpx;
+		}
+		.captcha-campus-inputs{
+			flex: 1;
+			margin-right: 20rpx;
+		}
+	}
+	
 </style>
diff --git a/pages/giftPack/user.vue b/pages/giftPack/user.vue
index 7ddba60..fcdcf3a 100644
--- a/pages/giftPack/user.vue
+++ b/pages/giftPack/user.vue
@@ -215,7 +215,8 @@
 	}
 	
 	.user {
-		background-image: linear-gradient(to right, #f25448, #fe786d);
+		background-image: linear-gradient(to right, #ecdec4, #f6eee1);
+		// background-image: linear-gradient(to right, #f25448, #fe786d);
 		border-radius: 10rpx;
 		padding: 30rpx;
 		box-sizing: border-box;
@@ -227,7 +228,8 @@
 			width: 190rpx;
 		}
 		.userTop {
-			color: #ffffff;
+			// color: #ffffff;
+			color: #796230;
 			.userTop-name {
 				display: flex;
 				font-size: 46rpx;
@@ -246,7 +248,8 @@
 		}
 		.userItem {
 			margin: 30rpx 0;
-			background-image: linear-gradient(to right, #fce1d6, #fce1d6);
+			// background-image: linear-gradient(to right, #fce1d6, #fce1d6);
+			background-image: linear-gradient(to right, #f5f1e5, #f5f1e5);
 			border-radius: 10rpx;
 			display: flex;
 			padding: 30rpx 0;
@@ -266,21 +269,22 @@
 					}
 				}
 				.userItem-label-text {
-					color: #ea7e4d;
+					color: #796230;
 					font-size: 26rpx;
 					padding-top: 10rpx;
 				}
 			}
 		}
 		.userList {
-			background: linear-gradient(to right, #fce1d6, #fce1d6);
+			background: linear-gradient(to right, #f5f1e5, #f5f1e5);
 			border-radius: 10rpx;
 			display: flex;
 			padding: 30rpx 20rpx;
 			line-height: 60rpx;
 			box-sizing: border-box;
 			font-size: 32rpx;
-			color: #ea7e4d;
+			// color: #ea7e4d;
+			color: #000000;
 			.userList-img {
 				width: 60rpx;
 				margin-right: 20rpx;
@@ -289,7 +293,7 @@
 		}
 		.userTips {
 			width: 100%;
-			color: #ffffff;
+			color: #796230;
 			display: flex;
 			font-size: 28rpx;
 			margin-top: 30rpx;
@@ -399,7 +403,7 @@
 				color: #abaeb2;
 			}
 			&.active .campusBtn-name {
-				color: #f55249;
+				color: #474d73;
 			}
 		}
 	}
diff --git a/static/img/campusRedLogin_logo.png b/static/img/campusRedLogin_logo.png
new file mode 100644
index 0000000..8867758
Binary files /dev/null and b/static/img/campusRedLogin_logo.png differ
diff --git a/static/img/giftPack-img01.png b/static/img/giftPack-img01.png
index fc6f292..d682ab3 100644
Binary files a/static/img/giftPack-img01.png and b/static/img/giftPack-img01.png differ
diff --git a/static/img/giftPack-img03.png b/static/img/giftPack-img03.png
index 3b2073e..82221f1 100644
Binary files a/static/img/giftPack-img03.png and b/static/img/giftPack-img03.png differ
diff --git a/static/img/giftPack-img04.png b/static/img/giftPack-img04.png
index 2ee785b..7c84bd2 100644
Binary files a/static/img/giftPack-img04.png and b/static/img/giftPack-img04.png differ
diff --git a/static/img/giftPack-img05.png b/static/img/giftPack-img05.png
index 62ca492..ea2f985 100644
Binary files a/static/img/giftPack-img05.png and b/static/img/giftPack-img05.png differ
diff --git a/static/img/giftPack-user00_active.png b/static/img/giftPack-user00_active.png
index df30e46..ad88066 100644
Binary files a/static/img/giftPack-user00_active.png and b/static/img/giftPack-user00_active.png differ
diff --git a/static/img/giftPack-user01_active.png b/static/img/giftPack-user01_active.png
index ff77fa4..fce4e4e 100644
Binary files a/static/img/giftPack-user01_active.png and b/static/img/giftPack-user01_active.png differ
diff --git a/static/img/giftPackArrow.png b/static/img/giftPackArrow.png
index a35c28a..5694507 100644
Binary files a/static/img/giftPackArrow.png and b/static/img/giftPackArrow.png differ