diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 2f1ce66..8bc8423 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -40,7 +40,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(options);
+    //删除临时存储的联系人
+    wx.removeStorageSync('linkMan')
     let rect = wx.getMenuButtonBoundingClientRect(),
       that = this;
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 5dc5b51..3470235 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -27,14 +27,15 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==1?'color:#FFB423':''}}">演出</view>
     </view>
-    <view class="type-item" bindtap="changeType" data-type="4">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==4?'color:#63B71F':''}}">电影</view>
-    </view>
     <view class="type-item" bindtap="changeType" data-type="2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==2?'color:#C155E9':''}}">展览</view>
     </view>
+    <view class="type-item" bindtap="changeType" data-type="4">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==4?'color:#63B71F':''}}">电影</view>
+    </view>
+
     <!-- <view class="type-item" bindtap="changeType" data-type="5">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
diff --git a/pages/order/components/address/index.js b/pages/order/components/address/index.js
index 8be68f1..98e5ad6 100644
--- a/pages/order/components/address/index.js
+++ b/pages/order/components/address/index.js
@@ -18,82 +18,94 @@ Component({
    * 组件的初始数据
    */
   data: {
-    selectLinkman:null,
-    linkmanList:[],
-    showMask:false,
-    editId:null
+    selectLinkman: null,
+    linkmanList: [],
+    showMask: false,
+    editId: null
   },
   lifetimes: {
-    attached: function() {
+    attached: function () {
       // 在组件实例进入页面节点树时执行
-      // 获取默认联系人
-      commonApi.user_post("token/check").then(res=>{
-        if(res.code==1){
-          userApi.user_post("user/getDefaultContact",{
-            contactType:"CONSIGNEE"
-          }).then(res=>{
-            console.log(res)
-            this.setData({
-              selectLinkman:res.data
-            })
-            if(res.data){
-              this.triggerEvent("setAddress",res.data)
-            }
+      // 获取默认联系人 如果有临时存储的联系人则不获取默认联系人
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          console.log(wx.getStorageSync('linkMan'));
+          if (wx.getStorageSync('linkMan')) {
             this.getLinkmanList()
-          })
+          } else {
+            userApi.user_post("user/getDefaultContact", {
+              contactType: "CONSIGNEE"
+            }).then(res => {
+              this.setData({
+                selectLinkman: res.data
+              })
+              if (res.data) {
+                this.triggerEvent("setAddress", res.data)
+              }
+              this.getLinkmanList()
+            })
+          }
+
         }
       })
-      
+
     },
-    detached: function() {
+    detached: function () {
       // 在组件实例被从页面节点树移除时执行
     },
   },
   pageLifetimes: {
-    show: function() {
+    show: function () {
       // 页面被展示
-      if(this.data.editId){
+      if (this.data.editId) {
         let editId = this.data.editId;
-        userApi.user_post("user/getContactInfoById",{
-          id:editId
-        }).then(res=>{
-          let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
-          if(selectLinkman.id==editId){
+        userApi.user_post("user/getContactInfoById", {
+          id: editId
+        }).then(res => {
+          let selectLinkman = this.data.selectLinkman,
+            linkmanList = this.data.linkmanList;
+          if (selectLinkman.id == editId) {
             selectLinkman.name = res.data.name;
             selectLinkman.tel = res.data.tel;
             selectLinkman.address = res.data.address;
             selectLinkman.is_default = res.data.is_default;
           }
-          linkmanList.map(item=>{
-            if(item.id==editId){
+          linkmanList.map(item => {
+            if (item.id == editId) {
               item.name = res.data.name;
               item.tel = res.data.tel;
               item.address = res.data.address;
               item.is_default = res.data.is_default;
-            }
-            else if(res.data.is_default==1 && item.is_default==1){
+            } else if (res.data.is_default == 1 && item.is_default == 1) {
               item.is_default = 0;
             }
           })
           this.setData({
-            linkmanList:linkmanList,
-            selectLinkman:selectLinkman
+            linkmanList: linkmanList,
+            selectLinkman: selectLinkman
           })
-          this.triggerEvent("setAddress",res.data)
+          this.triggerEvent("setAddress", res.data)
         })
-      }
-      else {
-        commonApi.user_post("token/check").then(res=>{
-          if(res.code==1){
-            this.getDefault()
+      } else {
+        commonApi.user_post("token/check").then(res => {
+          if (res.code == 1) {
+            if (!wx.getStorageSync('linkMan')) {
+                this.getDefault()
+            }else{
+              this.setData({
+                selectLinkman: wx.getStorageSync('linkMan')
+              })
+              this.triggerEvent("setAddress",wx.getStorageSync('linkMan'))
+              this.getLinkmanList()
+            }
           }
         })
       }
     },
-    hide: function() {
+    hide: function () {
       // 页面被隐藏
     },
-    resize: function(size) {
+    resize: function (size) {
       // 页面尺寸变化
     }
   },
@@ -102,23 +114,23 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    gotoEdit:function(e){
+    gotoEdit: function (e) {
       this.setData({
-        editId:e.currentTarget.dataset.item.id
+        editId: e.currentTarget.dataset.item.id
       })
       wx.navigateTo({
-        url: '/pages/user/address/add/index?id='+this.data.editId+'&from=order',
+        url: '/pages/user/address/add/index?id=' + this.data.editId + '&from=order',
       })
       this.setData({
-        editId:null
+        editId: null
       })
     },
-    showLinkman:function(){
+    showLinkman: function () {
       this.setData({
-        showMask:!this.data.showMask
+        showMask: !this.data.showMask
       })
     },
-    cancel:function(){
+    cancel: function () {
       // let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
       // linkmanList.map(linkman=>{
       //   linkman.selected = 0;
@@ -131,85 +143,90 @@ Component({
       // })
       this.showLinkman()
     },
-    confirm:function(){
-      let linkmanList = this.data.linkmanList,selectLinkman = null;
-      linkmanList.map(linkman=>{
-        if(linkman.selected==1){
+    confirm: function () {
+      let linkmanList = this.data.linkmanList,
+        selectLinkman = null;
+      linkmanList.map(linkman => {
+        if (linkman.selected == 1) {
           selectLinkman = (linkman);
         }
       })
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman: selectLinkman
       })
-      this.triggerEvent("setAddress",selectLinkman)
+      this.triggerEvent("setAddress", selectLinkman)
       this.showLinkman()
     },
-    getLinkmanList:function(){
+    getLinkmanList: function () {
       // 直接获取1000条出行人信息 就不要分页了
-      userApi.user_post("user/getContactOrConsignee",{
-        contactType:"CONSIGNEE",
-        offset:0,
-        limit:1000
-      }).then(res=>{
+      userApi.user_post("user/getContactOrConsignee", {
+        contactType: "CONSIGNEE",
+        offset: 0,
+        limit: 1000
+      }).then(res => {
         let list = res.data;
         this.setData({
-          linkmanList:list
+          linkmanList: list
         })
       })
     },
-    setDefault:function(e){
-      let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList;
-      userApi.user_post("user/setDefaultConsignee",{
-        id:item.id
-      }).then(res=>{
-        if(res.code==1){
+    setDefault: function (e) {
+      let item = e.currentTarget.dataset.item,
+        linkmanList = this.data.linkmanList;
+      userApi.user_post("user/setDefaultConsignee", {
+        id: item.id
+      }).then(res => {
+        if (res.code == 1) {
           wx.showToast({
             title: '设置成功',
             icon: 'success'
           })
-          linkmanList.map(linkman=>{
-            if(linkman.id==item.id){
-              linkman.is_default=1;
-            }
-            else {
+          linkmanList.map(linkman => {
+            if (linkman.id == item.id) {
+              linkman.is_default = 1;
+            } else {
               linkman.is_default = 0;
             }
           })
           this.setData({
-            linkmanList:linkmanList
+            linkmanList: linkmanList
           })
         }
       })
     },
-    delLinkman:function(e){
+    delLinkman: function (e) {
       wx.showLoading({
         title: '加载中',
       })
-      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman;
-      selectLinkman.splice(index,1);
+      let index = e.currentTarget.dataset.index,
+        selectLinkman = this.data.selectLinkman;
+      selectLinkman.splice(index, 1);
       this.setData({
-        selectLinkman:selectLinkman
+        selectLinkman: selectLinkman
       })
       wx.hideLoading()
     },
-    del:function(e){
-      let item = e.currentTarget.dataset.item,index = e.currentTarget.dataset.index,that = this,linkmanList=this.data.linkmanList;
+    del: function (e) {
+      let item = e.currentTarget.dataset.item,
+        index = e.currentTarget.dataset.index,
+        that = this,
+        linkmanList = this.data.linkmanList;
       wx.showModal({
-        title:"提示",
-        content:"确定删除吗？",
-        success (res) {
+        title: "提示",
+        content: "确定删除吗？",
+        success(res) {
           if (res.confirm) {
-            userApi.user_post("user/delConsignee",{
-              id:item.id
-            }).then(res=>{
-              if(res.code==1){
+            userApi.user_post("user/delConsignee", {
+              id: item.id
+            }).then(res => {
+              if (res.code == 1) {
                 wx.showToast({
                   title: '删除成功',
-                  icon:"success"
+                  icon: "success"
                 })
-                linkmanList.splice(index,1);
+                linkmanList.splice(index, 1);
                 that.setData({
-                  linkmanList:linkmanList
+                  linkmanList: linkmanList
                 })
               }
             })
@@ -220,26 +237,28 @@ Component({
         }
       })
     },
-    selectIt:function(e){
+    selectIt: function (e) {
       let item = e.currentTarget.dataset.item;
       this.setData({
-        selectLinkman:item,
-        showMask:false
+        selectLinkman: item,
+        showMask: false
       })
-      this.triggerEvent("setAddress",item)
+      wx.setStorageSync('linkMan', item)
+      console.log(wx.getStorageSync('linkMan'));
+      this.triggerEvent("setAddress", item)
     },
-    getDefault:function(e){
-      commonApi.user_post("token/check").then(res=>{
-        if(res.code==1){
-          userApi.user_post("user/getDefaultContact",{
-            contactType:"CONSIGNEE"
-          }).then(res=>{
+    getDefault: function (e) {
+      commonApi.user_post("token/check").then(res => {
+        if (res.code == 1) {
+          userApi.user_post("user/getDefaultContact", {
+            contactType: "CONSIGNEE"
+          }).then(res => {
             console.log(res)
             this.setData({
-              selectLinkman:res.data
+              selectLinkman: res.data
             })
-            if(res.data){
-              this.triggerEvent("setAddress",res.data)
+            if (res.data) {
+              this.triggerEvent("setAddress", res.data)
             }
             this.getLinkmanList()
           })
@@ -247,4 +266,4 @@ Component({
       })
     }
   }
-})
+})
\ No newline at end of file
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index be9edfe..f847587 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -70,9 +70,10 @@ Page({
     })
   },
   setAddress: function (e) {
-    this.setData({
-      address: e.detail
-    })
+    console.log('我触发了');
+      this.setData({
+        address: e.detail
+      })
     this.getPostFee()
   },
   minus: function (e) {
@@ -308,6 +309,7 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
+    console.log(12312312321);
 
   },
 
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index 0e43790..deb8f2e 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -53,9 +53,9 @@
 		</view>
 		<view wx:if="{{item.comfort_level===itemY.level}}" wx:for-item="itemY" style="color:{{itemY.color}}" wx:for="{{comfortLevel}}" class="two">{{itemY.desc}}</view>
 	</view>
-	<view class="num">
+	<!-- <view class="num">
 		瞬时承载量:{{item.ins_carry_capacity}}人
-	</view>
+	</view> -->
 	</view>
 	<view class="other-tip">
     <text>更新时间:{{item.status_time}}</text>
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index c801dbe..b699e0b 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -133,7 +133,7 @@ font-weight: 500;
 color: #83D851;
 }
 .info{
-	width: 650rpx;
+	width: 630rpx;
 	min-height: 134rpx;
 	border-radius: 10rpx;
 	padding: 28rpx 20rpx;
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index ad38fe5..c51d1b1 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -28,6 +28,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.removeStorageSync('linkMan')
     this.getList();
   },
   manage: function () {
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index 1d26442..bf54959 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -18,7 +18,6 @@
 		<view class="yuan l">
 		</view>
 		<view class="line">
-			---------------------------------------------
 		</view>
 		<view class="yuan r">
 		</view>
diff --git a/pages/user/coupon/index.wxss b/pages/user/coupon/index.wxss
index 236613c..c7faac0 100644
--- a/pages/user/coupon/index.wxss
+++ b/pages/user/coupon/index.wxss
@@ -103,11 +103,12 @@ page {
 .coupon-tip text {
   color: #999999;
   display: inline-block;
-  width: 160rpx;
+  width: 130rpx;
 }
 .coupon-rule {
   font-size: 26rpx;
-
+  margin-top: 20rpx;
+  
 }
 .rule-text{
 	margin-top:10rpx;
@@ -131,4 +132,8 @@ page {
 }
 .fixed-btn text {
   color: #0B898E;
+}
+.line{
+  height: 25rpx;
+  border-bottom: dashed 1rpx #D8D8D8;
 }
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index aa385b4..556623e 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -71,6 +71,9 @@
   <view class="detail-item">
     <text>座位：{{info.order_product_list[0].order_product_extend.seats_list}}</text>
   </view>
+  <view class="detail-item" wx:if="{{info.order_product_list[0].order_product_extend.ticket_code}}">
+    <text style="color: #D62828;">{{info.order_product_list[0].order_product_extend.ticket_code}} 请凭取票凭证码至影院大厅内影院自有取票机或前台进行取票</text>
+  </view>
 </view>
 <view class="box">
   <view class="box-title">出行人</view>
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 043e2c6..3e293b9 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -49,33 +49,37 @@ Page({
   },
   getCodeImg:function(){
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
-    qrcode.map((item,index)=>{
-      if(item.use_url){
-        codeImgs.push(item.use_url);
-        if(codeImgs.length==qrcode.length){
-          that.setData({
-            codeImgs:codeImgs
-          })
+
+    this.data.info.order_product_list.forEach(qrcode=>{
+      qrcode.qrcode.map((item,index)=>{
+        if(item.use_url){
+          codeImgs.push(item.use_url);
+          if(codeImgs.length==qrcode.qrcode.length){
+            that.setData({
+              codeImgs:codeImgs
+            })
+          }
         }
-      }
-      else {
-        new QRCode('damocode'+index,{
-          text: item.use_code,
-          width: 300 * radio,
-          height: 300 * radio,
-          padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
-          correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
-          callback: (res) => {
-            codeImgs.push(res.path);
-            if(codeImgs.length==qrcode.length){
-              that.setData({
-                codeImgs:codeImgs
-              })
+        else {
+          new QRCode('damocode'+index,{
+            text: item.use_code,
+            width: 300 * radio,
+            height: 300 * radio,
+            padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
+            correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
+            callback: (res) => {
+              codeImgs.push(res.path);
+              if(codeImgs.length==qrcode.qrcode.length){
+                that.setData({
+                  codeImgs:codeImgs
+                })
+              }
             }
-          }
-        })
-      }
-    }) 
+          })
+        }
+      }) 
+    })
+
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;