文档修复

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;

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>

pages/order/components/address/index.js

@@ -26,13 +26,16 @@ Component({
   lifetimes: {
     attached: function () {
       // 在组件实例进入页面节点树时执行
-      // 获取默认联系人
+      // 获取默认联系人 如果有临时存储的联系人则不获取默认联系人
       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 => {
-            console.log(res)
               this.setData({
                 selectLinkman: res.data
               })
@@ -42,6 +45,8 @@ Component({
               this.getLinkmanList()
             })
           }
+
+        }
       })
 
     },
@@ -57,7 +62,8 @@ Component({
         userApi.user_post("user/getContactInfoById", {
           id: editId
         }).then(res => {
-          let selectLinkman = this.data.selectLinkman,linkmanList = this.data.linkmanList;
+          let selectLinkman = this.data.selectLinkman,
+            linkmanList = this.data.linkmanList;
           if (selectLinkman.id == editId) {
             selectLinkman.name = res.data.name;
             selectLinkman.tel = res.data.tel;
@@ -70,8 +76,7 @@ Component({
               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;
             }
           })
@@ -81,11 +86,18 @@ Component({
           })
           this.triggerEvent("setAddress", res.data)
         })
-      }
-      else {
+      } 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()
+            }
           }
         })
       }
@@ -132,7 +144,8 @@ Component({
       this.showLinkman()
     },
     confirm: function () {
-      let linkmanList = this.data.linkmanList,selectLinkman = null;
+      let linkmanList = this.data.linkmanList,
+        selectLinkman = null;
       linkmanList.map(linkman => {
         if (linkman.selected == 1) {
           selectLinkman = (linkman);
@@ -158,7 +171,8 @@ Component({
       })
     },
     setDefault: function (e) {
-      let item = e.currentTarget.dataset.item,linkmanList = this.data.linkmanList;
+      let item = e.currentTarget.dataset.item,
+        linkmanList = this.data.linkmanList;
       userApi.user_post("user/setDefaultConsignee", {
         id: item.id
       }).then(res => {
@@ -170,8 +184,7 @@ Component({
           linkmanList.map(linkman => {
             if (linkman.id == item.id) {
               linkman.is_default = 1;
-            }
-            else {
+            } else {
               linkman.is_default = 0;
             }
           })
@@ -185,7 +198,8 @@ Component({
       wx.showLoading({
         title: '加载中',
       })
-      let index = e.currentTarget.dataset.index,selectLinkman = this.data.selectLinkman;
+      let index = e.currentTarget.dataset.index,
+        selectLinkman = this.data.selectLinkman;
       selectLinkman.splice(index, 1);
       this.setData({
         selectLinkman: selectLinkman
@@ -193,7 +207,10 @@ Component({
       wx.hideLoading()
     },
     del: function (e) {
-      let item = e.currentTarget.dataset.item,index = e.currentTarget.dataset.index,that = this,linkmanList=this.data.linkmanList;
+      let item = e.currentTarget.dataset.item,
+        index = e.currentTarget.dataset.index,
+        that = this,
+        linkmanList = this.data.linkmanList;
       wx.showModal({
         title: "提示",
         content: "确定删除吗？",
@@ -226,6 +243,8 @@ Component({
         selectLinkman: item,
         showMask: false
       })
+      wx.setStorageSync('linkMan', item)
+      console.log(wx.getStorageSync('linkMan'));
       this.triggerEvent("setAddress", item)
     },
     getDefault: function (e) {

pages/order/postOrder/index.js

@@ -70,6 +70,7 @@ Page({
     })
   },
   setAddress: function (e) {
+    console.log('我触发了');
       this.setData({
         address: e.detail
       })
@@ -308,6 +309,7 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
+    console.log(12312312321);
 
   },
 

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>

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;

pages/user/cartlist/list.js

@@ -28,6 +28,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.removeStorageSync('linkMan')
     this.getList();
   },
   manage: function () {

pages/user/coupon/index.wxml

@@ -18,7 +18,6 @@
 		<view class="yuan l">
 		</view>
 		<view class="line">
-			---------------------------------------------
 		</view>
 		<view class="yuan r">
 		</view>

pages/user/coupon/index.wxss

@@ -103,10 +103,11 @@ page {
 .coupon-tip text {
   color: #999999;
   display: inline-block;
-  width: 160rpx;
+  width: 130rpx;
 }
 .coupon-rule {
   font-size: 26rpx;
+  margin-top: 20rpx;
   
 }
 .rule-text{
@@ -132,3 +133,7 @@ page {
 .fixed-btn text {
   color: #0B898E;
 }
+.line{
+  height: 25rpx;
+  border-bottom: dashed 1rpx #D8D8D8;
+}

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>

pages/user/order/sceneOrderInfo/index.js

@@ -49,10 +49,12 @@ 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)=>{
+
+    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.length){
+          if(codeImgs.length==qrcode.qrcode.length){
             that.setData({
               codeImgs:codeImgs
             })
@@ -67,7 +69,7 @@ Page({
             correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度
             callback: (res) => {
               codeImgs.push(res.path);
-            if(codeImgs.length==qrcode.length){
+              if(codeImgs.length==qrcode.qrcode.length){
                 that.setData({
                   codeImgs:codeImgs
                 })
@@ -76,6 +78,8 @@ Page({
           })
         }
       }) 
+    })
+
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;