Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

Common.wxss

@@ -54,6 +54,9 @@
 .commonF .f46{
     font-size:46rpx;
 }
+.commonF .f52{
+  font-size: 52rpx;
+}
 .commonF .bold{
     font-weight: 600;
 }
@@ -115,6 +118,9 @@
 .commonF .cee{
   color: #EE4454;
 }
+.commonF .cc2{
+  color: #C2C2C2;
+}
 image{
   width: 100%;
   height: 100%;

app.js

@@ -52,8 +52,8 @@ App({
       let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
       wx.request({
         // url: 'http://192.168.2.214:8082/api/Common/Post',
-        url: 'http://192.168.2.16:8083/api/Common/Post',
-        // url: 'https://reborn.oytour.com/api/common/post',  //线上
+        // url: 'http://192.168.2.16:8083/api/Common/Post',
+        url: 'https://reborn.oytour.com/api/common/post',  //线上
         // url: ' http://test.viitto.com/api/common/post',
        
         method: 'POST',
@@ -91,9 +91,9 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
       wx.request({
-        url: 'http://192.168.2.214:8082/api/Common/Post',
-        // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
-        // url: 'https://reborn.oytour.com/api/common/post',  //线上
+        // url: 'http://192.168.2.214:8082/api/Common/Post',
+        // url: 'http://192.168.2.16:8283/api/Common/Post', //春姐
+        url: 'https://reborn.oytour.com/api/common/post',  //线上
         // url: ' http://test.viitto.com/api/common/post',
 
         method: 'POST',
@@ -123,9 +123,9 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
-        // url: 'https://efficient.oytour.com/' + url, //线上
+        url: 'https://efficient.oytour.com/' + url, //线上
         // url: 'http://47.96.12.235:9001/' + url,       //测试 
-        url: 'http://192.168.2.215:9000/'+ url,
+        // url: 'http://192.168.2.215:9000/'+ url,
 
         method: 'POST',
         data: {
@@ -175,9 +175,9 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
-        // url: 'https://efficient.oytour.com/'+ url, //线上
+        url: 'https://efficient.oytour.com/'+ url, //线上
         // url: 'http://47.96.12.235:9001/' + url,       //测试 
-        url: 'http://192.168.2.215:9000/'+ url,
+        // url: 'http://192.168.2.215:9000/'+ url,
 
         method: 'POST',
         data: {
@@ -224,8 +224,8 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
-        // url: 'https://efficient.oytour.com/'+ url, //线上
-        url: 'http://47.96.12.235:9001/' + url,       //测试 
+        url: 'https://efficient.oytour.com/'+ url, //线上
+        // url: 'http://47.96.12.235:9001/' + url,       //测试 
         
         method: 'POST',
         data: {

app.json

@@ -63,7 +63,8 @@
     "pages/local/FoodOrder/FoodOrder",
     "pages/Pay/Pay",
     "pages/mine/Happypassbook/Happypassbook",
-    "pages/mine/UseDetails/UseDetails"
+    "pages/mine/UseDetails/UseDetails",
+    "pages/shopPage/shopPage"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -85,13 +86,13 @@
         "text": "首页"
       },
       {
-        "pagePath": "pages/Home/home",
+        "pagePath": "pages/shopPage/shopPage",
         "iconPath": "images/tarbar/index2.png",
         "selectedIconPath": "images/tarbar/index22.png",
         "text": "目的地"
       },
       {
-        "pagePath": "pages/member/member",
+        "pagePath": "pages/shopPage/shopPage",
         "iconPath": "images/tarbar/index3.png",
         "selectedIconPath": "images/tarbar/index33.png",
         "text": "积分商城"

pages/GroupTour/ChDateNum/ChDateNum.js

@@ -172,6 +172,8 @@ Page({
       IsReturnIntermodal: 2,
       OldPeopleNum: 0,
       SingleRoomNum: 0,
+      lineId: that.data.trip.lineId,
+      lineteamId: that.data.trip.lineteamId,
     };
     wx.setStorageSync('payInfo', msg)
     wx.navigateTo({

pages/GroupTour/ChDateNum/ChDateNum.wxml

@@ -77,7 +77,7 @@
 
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">开始预定</view>
   </view>

pages/GroupTour/FillOrder/FillOrder.js

@@ -14,15 +14,189 @@ Page({
       ContactMobile: "",
       ContactName: "",
     },
+    code: '',  //输入的 兑换码
+    userInfo: {},
+    RedEnvelopeMoneyALL: 0, //获取的 存折金额
+    RedMoney: '', //输入的 红包金额
+    teamType: '',// 0 跟团游  1自由行  2当地游
+    cpList: [], // 优惠券数据
+    cpBoxShow: false,
+    SettlementPrice: 0,
+    CouponLength: '',
+    GoodsView: false
   },
+  // 关闭或打开 价格详情
+  CloseGoodsView: function (){
+    this.setData({
+      GoodsView: !this.data.GoodsView,
+    })
+  },
+  // 关闭打开优惠券选择box
+  closeBox: function(){
+    this.setData({
+      cpBoxShow: !this.data.cpBoxShow
+    })
+  },
+  // 选择优惠券 一些逻辑
+  clickCP: function (e) {
+    let index = e.currentTarget.dataset.index 
+    let list = this.data.cpList;
+    if (list[index].dis) {  // 禁用了的点击直接爬开
+      return
+    }
+    let jishu = 0;
+    list[index].checkd = !list[index].checkd;
+    // 先判断是否叠加
+    if (list[index].overlapUse == 1) { // 可叠加
+      for (let i = 0; i < list.length; i++) {
+        if (list[index].id !== list[i].id && list[i].overlapUse !== 1) { // 排除自己  禁用不可叠加
+          list[i].dis = true
+        }
+      }
+    } else {  // 不可叠加
+      for (let i = 0; i < list.length; i++) {
+        if (list[index].id !== list[i].id) { // 排除自己  全部禁用
+          list[i].dis = true
+        }
+      }
+    }
+    for (let i = 0; i < list.length; i++) { // 获取选中的个数 
+      if (list[i].checkd) {  
+        jishu = jishu + 1
+      }
+    }
+    if (jishu == 0){  // 莫得选中的解除全部禁用
+      list.map(i=>{
+        i.dis = false
+      })
+    }
+    this.setData({
+      cpList: list
+    })
+    // 计算金额
+    this.getCpPrice()
+    //有点麻烦 先凑合用
+  },
+  // 获取优惠券优惠金额
+  getCpPrice: function(){
+    let price = this.data.payInfo.PreferPrice,
+      yPrice = 0, cpList = this.data.cpList, type = 0, CouponMoney = 0, CouponSale = 1, CouponIds = '', CouponLength = 0, SettlementPrice = 0;
+    cpList.map(item => {
+      if (item.checkd) {
+        
+        type = item.couponsType
+        CouponLength = CouponLength + 1
+        CouponIds = CouponIds + item.id + ','
+        if (item.couponsType === 1) {
+          CouponMoney = CouponMoney + item.denomination
+        } else {
+          CouponSale = CouponSale * (item.denomination / 10)
+        }
+      }
+      if (type === 1) {
+        SettlementPrice = price - (price - CouponMoney)
+      } else if (type === 2) {
+        SettlementPrice = price - (price * CouponSale)
+      } else if (type === 0) {
+        SettlementPrice = 0
+      }
+    })
+    this.setData({
+      CouponLength: CouponLength,
+      CouponIds: CouponIds,
+      SettlementPrice: SettlementPrice,
+    })
+  },
+  // 获取优惠券
+  getCpList: function (){
+    let msg = {
+      lineId: this.data.payInfo.lineId,
+      lineteamId: this.data.payInfo.lineteamId,
+      CouponsUseScope: 2,
+    }
+    app.$apiJavaData("api/b2b/user/getUserCanUseCouponList", { ActivateCode: this.data.code }).then(res => {
+      let data = res.data
+      let list = [];
+      for(let i = 0; i < data.length; i++) {
+        data[i].effectDate = data[i].effectDate.split(' ')[0].replace(/-/g,'.')
+        data[i].expirationDate = data[i].expirationDate.split(' ')[0].replace(/-/g, '.')
+        data[i].dis = false
+        data[i].ckeckd = false
+        if (this.data.payInfo.PreferPrice > data[i].useCondition){
+          list.push(data[i])
+        }
+      }
+      this.setData({
+        cpList: list
+      })
+    }).catch(err => { })
+  },
+  //输入使用存折金额
+  changeRedMoney: function (e){
+    let money = 0;
+    if (/^(\d?)+(\.\d{0,2})?$/.test(e.detail.value)) {
+      money = e.detail.value;
+    } else {
+      money = e.detail.value.substring(0, e.detail.value.length - 1);
+    }
+    console.log(money)
+    if (money !== ""  && parseFloat(money) > this.data.RedEnvelopeMoneyALL) {
+      money = this.data.RedEnvelopeMoneyALL
+      wx.showToast({
+        title: '最大金额不能超过余额',
+        icon: 'none',
+        duration: 2000
+      })
+    }
+    this.setData({
+      RedMoney: parseFloat(money)
+    })
+  },
+  // 获取幸福存折余额
+  getHappyMoney: function (){
+    app.$api('customer_post_GetCustomerBigRedEnvelopeBalance', { CustomerId: this.data.userInfo.id}).then(res => {
+      this.setData({
+        RedEnvelopeMoneyALL: res
+      })
+    }).catch(err => {
 
+    })
+  }, 
+  //兑换码兑换
+  subCode: function () {
+    if (this.data.code == "") {
+      wx.showToast({
+        title: '请输入兑换码',
+        icon: 'none',
+        duration: 2000
+      })
+      return
+    }
+    app.$apiJavaData("api/b2b/user/updateUseCouponBycode", { ActivateCode: this.data.code}).then(res => {
+      wx.showToast({
+        title: '兑换成功，请到优惠券列表查看',
+        icon: 'none',
+        duration: 2000
+      })
+      this.getCpList()
+    }).catch(err => { })
+  },
+  // 写入兑换码
+  setCode: function (e) {
+    this.setData({
+      code: e.detail.value
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    console.log(options)
     let payInfo = wx.getStorageSync('payInfo');
     this.setData({
-      payInfo: payInfo
+      payInfo: payInfo,
+      userInfo: wx.getStorageSync('admin'),
+      teamType: options.teamType
     })
     let that = this;
     let msg = {};
@@ -42,9 +216,8 @@ Page({
         })
       this.getData(msg);
     }
-
-
-
+    this.getHappyMoney()
+    this.getCpList()
   },
   getData(msg) {
     let that = this;
@@ -122,13 +295,14 @@ Page({
       })
       return;
     }
+    this.data.payInfo.CouponAllotIds = this.data.CouponIds ? this.data.CouponIds.slice(0, this.data.CouponIds.length - 1) : ''
+    this.data.payInfo.DiscountMoney = this.data.SettlementPrice
+    this.data.payInfo.RedEnvelopeMoney = this.data.RedMoney
     app.$api('sellorder_post_SetOrderInfoForB2B', that.data.payInfo).then(res => {
-      let data = res;
-      if (res.resultCode == 1) {
-        wx.navigateTo({
-          url: '/pages/member/orderCenter/orderCenter?index=1',
-        })
-      }
+      let index = this.data.teamType == "0" ? 1 : this.data.teamType == "1" ? 2 : 3
+      wx.reLaunch({
+        url: '/pages/member/orderCenter/orderCenter?index=' + index,
+      })
     }).catch(err => {
 
     })

pages/GroupTour/FillOrder/FillOrder.wxml

@@ -29,19 +29,109 @@
       <view>电子邮件</view>
       <view><input placeholder='用于接收确认单，非必填'></input></view>
     </view>
+  </view>
+  <view class="Gray30"></view>
+  <view class="Form" wx:if="{{teamType == 0}}">
+    <view class="FormMsg f30" style="padding-left: 30rpx;">使用优惠</view>
+    <view class="FormMsg">
+      <view>兑换码</view>
+      <view class='duihuan'>
+        <input type='text' bindinput="setCode" placeholder='请输入兑换码' value="{{code}}"></input>
+        <text class='duihuan-btn f28' bindtap='subCode'>兑换</text>
+      </view>
+    </view>
+    <view class="FormMsg">
+      <view>幸福存折</view>
+      <view class='duihuan'>
+        <input bindinput='changeRedMoney' type='digit' placeholder='请输入使用金额' value="{{RedMoney}}"></input>
+        <text class='f24'>余额： <text class='cee'>{{RedEnvelopeMoneyALL}}</text></text>
+      </view>
+    </view>
+    <view class="FormMsg">
+      <view>优惠券</view>
+      <view class='Cp-box' bindtap='closeBox'>
+        <text class='f24 cee'>{{SettlementPrice > 0 ? "-¥"+  SettlementPrice : "" }}</text>
+        <text>{{CouponLength > 0 ? '已选'+ CouponLength +'张优惠券' : '请选择优惠券'}}</text>
+        <image src='../../../images/ticket/right_arr.png'></image>
+      </view>
+    </view>
   </view>
    <view class="PayView">
     <view style="width:400rpx;">
       <text class="f20">总价:￥</text>
-      <text class="f46 cee">{{payInfo.PreferPrice}}</text>
-      <text class="f20 c88">/人起</text>
-      <!-- <text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text> -->
-      <image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
+      <text class="f46 cee">{{payInfo.PreferPrice - SettlementPrice - RedMoney}}</text>
+      <!-- <text class="f20 c88">/人起</text> -->
+      <text bindtap='OpenGoodsView' bindtap='CloseGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text>
+      <image bindtap='OpenGoodsView' bindtap='CloseGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
 
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">去付款</view>
   </view>
+  <view class='cp-box' hidden='{{!cpBoxShow}}' bindtap='closeBox'>
+    <view class='cp-box-s' catchtap>
+      <view class='tit f30 c11'>优惠券</view>
+      <image catchtap='closeBox' class='close-img' src='/images/group/close.png'></image>
+      <scroll-view scroll-y style='height: 950rpx;padding-top: 30rpx;'>
+        <view catchtap='clickCP' class='cp-item' wx:for="{{cpList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-index='{{index}}'>
+          <view class='left' style="background: url({{item.dis ? '/images/menber/quanbg_8.png' : item.couponsType == 1 ? '/images/menber/quanbg_1.png' : '/images/menber/quanbg_02.png'}}) no-repeat; background-size: 100% 100%;">
+            <view class='cff'>
+              <text class='f20 ' wx:if="{{item.couponsType == 1}}">￥</text>
+              <text class='f52 '>{{item.denomination}}</text>
+              <text class='f20 ' wx:if="{{item.couponsType !== 1}}">折</text>
+            </view>
+            <view class='cff f24'>
+              {{item.couponsType == 1 ? '抵用券' : '折扣券'}}
+            </view>
+          </view>
+          <view class='flex2'>
+            <view class='f28 c11 margin-bt30'>
+              {{item.couponName}} <text class='padding-lr5 {{item.overlapUse == 0 ? "c99 gb-g" : "cee gb-r"}}'>{{item.overlapUse == 0 ? '不可叠加' : '可叠加'}}</text>
+            </view>
+            <view class='f22 cc2 '>
+              {{item.effectDate + '-' + item.expirationDate}}
+            </view>
+          </view>
+          <view class='checkd-box'>
+            <image wx:if="{{item.checkd}}" class='xuanzhong' src='/images/visa/xunazhong.png'></image>
+            <text wx:else class='raduis'></text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+  <!-- 商品详情 -->
+  <view hidden="{{!GoodsView}}" bindtap='CloseGoodsView' class='GoodsView'>
+    <view class="GoodsDes" catchtap>
+      <view class="f30 bold" style="padding-top:15rpx">费用明细
+        <image catchtap='CloseGoodsView'  style="width:30rpx;height:30rpx;float:right;margin:15rpx 15rpx 0 0" src="/images/group/close.png"></image>
+      </view> 
+      <view class="flexbe f26 c11">
+        <view class='f26'>基本团费</view>
+        <view>￥{{payInfo.PreferPrice}}</view>
+      </view> 
+      <view class="flexbe f22 c33" wx:if="{{payInfo.ManNum>0}}">
+        <view>成人</view>
+        <view>￥{{payInfo.Unit_Price  + ' × ' + payInfo.ManNum}}</view>
+      </view> 
+      <view class="flexbe f22 c33" wx:if="{{payInfo.ChirdNum > 0}}">
+        <view>儿童</view>
+        <view>￥{{payInfo.Unit_Price + ' × ' + payInfo.ChirdNum}}</view>
+      </view>
+      <view class="flexbe f26 c11" wx:if="{{SettlementPrice + RedMoney > 0}}">
+        <view class='f26'>优惠费用</view>
+        <view>-￥{{SettlementPrice + RedMoney}}</view>
+      </view>
+      <view class="flexbe f22 c33" wx:if="{{SettlementPrice > 0}}">
+        <view>优惠券</view>
+        <view>-￥{{SettlementPrice}}</view>
+      </view>
+      <view class="flexbe f22 c33" wx:if="{{RedMoney > 0}}">
+        <view>幸福存折</view>
+        <view>-￥{{RedMoney}}</view>
+      </view>
+    </view>
+  </view>
 </view>
\ No newline at end of file

pages/GroupTour/FillOrder/FillOrder.wxss

@@ -74,4 +74,127 @@
   background:rgba(238,68,84,1);
   color: #fff;
   font-size: 30rpx;
+}
+.duihuan{
+  flex: 2;
+  display: flex !important;
+  justify-content: space-between;
+  padding-right: 30rpx;
+  align-items: center;
+}
+.duihuan-btn{
+  width:120rpx;
+  height:54rpx;
+  background:rgba(238,68,84,1);
+  border-radius:12rpx;
+  text-align: center;
+  line-height: 54rpx;
+  color: white;
+}
+.Cp-box{
+  display: flex !important;
+  align-items: center;
+  justify-content: flex-end;
+  flex: 2;
+  padding-right: 30rpx;
+}
+.Cp-box text{
+  margin-right: 20rpx;
+}
+.Cp-box image{
+  width: 14rpx;
+  height: 27rpx;
+}
+.cp-box{
+  height: 100%;
+  width: 100%;
+  background:rgba(0,0,0,.5);
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: 101
+}
+.cp-box-s{
+  height: 90%;
+  width: 100%;
+  padding: 30rpx;
+  background-color: white;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  border-radius:12rpx 12rpx 0px 0px;
+}
+.tit{
+  text-align: center;
+}
+.close-img{
+  width: 30rpx;
+  height: 30rpx;
+  position: absolute;
+  right: 30rpx;
+  top: 30rpx;
+}
+.left{
+  width: 146rpx;
+  height: 143rpx;
+  margin-right: 31rpx;
+  text-align: center;
+}
+.cp-item{
+  margin-bottom: 30rpx;
+  display: flex;
+  align-items: center;
+}
+.raduis{
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 50%;
+  display: inline-block;
+  border: 1px solid rgba(153, 153, 153, 1);
+}
+.xuanzhong{
+  width: 30rpx;
+  height: 30rpx;
+}
+.checkd-box{
+  margin-left: 50rpx;
+}
+.margin-bt30{
+  margin-bottom: 30rpx;
+}
+.gb-r{
+  background-color: #FFA4AD;
+}
+.gb-g{
+  background-color: #CCCCCC;
+}
+.padding-lr5{
+  padding: 0 5rpx;
+}
+.flex2{
+  flex: 2
+}
+.GoodsDes{
+  background: #fff;
+  border-radius:12rpx 12rpx 0px 0px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  
+}
+.GoodsView .flexbe{
+  padding:15rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+
+}
+.GoodsView{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: calc(100% - 100rpx);
+  background:rgba(0,0,0,0.5); 
+  z-index: 100;
+  text-align: center;
 }
\ No newline at end of file

pages/GroupTour/GroupDetails/GroupDetails.js

@@ -133,9 +133,19 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
+    console.log(wx.getStorageSync('admin'))
   },
   StartYd() {
+    
+    let isLogin = wx.getStorageSync('admin') ? 1 : 0
+    console.log(isLogin)
+    if (isLogin == 0) {
+      
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+      return
+    }
     let msg = this.data.msg;
     wx.navigateTo({
       url: '/pages/GroupTour/ChDateNum/ChDateNum?idDes=' + encodeURIComponent(msg.configId) + "&tcid=" + msg.tcid + "&teamType=" + msg.teamType,

pages/GroupTour/GroupDetails/GroupDetails.wxml

@@ -247,7 +247,7 @@
       <text class="f20 c88">/人起</text>
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">开始预定</view>
   </view>

pages/GroupTour/GroupTour.wxml

@@ -3,23 +3,6 @@
  <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
 </view>
  
-  <!-- <view class="page-section page-section-spacing">
-    <swiper class="swiper" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" vertical="{{vertical}}" indicator-color="rgba(242,242,242,1);" indicator-active-color="rgba(238,68,84,1)" interval="{{interval}}" duration="{{duration}}">
-      <block wx:for="{{background}}" wx:key="*this">
-        <swiper-item>
-          <block wx:for="{{item.list}}" wx:for-item="bac" wx:key="index">
-            <view class="Item">
-              <view>
-                <image style="width:42rpx;height:48rpx" src="../../images/group/t1.png"></image>
-              </view>
-              <text class="f22">{{bac.name}}</text>
-            </view>
-          </block>
-
-        </swiper-item>
-      </block>
-    </swiper>
-  </view> -->
   <scroll-view scroll-x class="scroll-banner">
     <view wx:for="{{lineList}}" wx:key="index" class="scroll-view-item">
       <view bindtap="Gourl" data-item="{{item}}" class="Item">

pages/GroupTour/Pay/Pay.wxml

@@ -29,18 +29,5 @@
       支付宝支付
     </view>
   </view>
-  <!-- <view class="PayView">
-    <view style="width:310rpx;">
-      <text class="f20">总价:￥</text>
-      <text class="f46 cee">999</text>
-      <text class="f20 c88">/人起</text>
-      <text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text>
-      <image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
-
-    </view>
-    <view style="width:100rpx;border-left:1px solid #E9E9E9;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
-    </view>
-    <view bindtap='StartYd' class="startPay">去付款</view>
-  </view> -->
+ 
 </view>
\ No newline at end of file

pages/Home/home.js

@@ -21,8 +21,12 @@ Page({
     freeList:[],
     scenList:[],
     localList:[],
+  }, 
+  goJiPiao: function (){
+    wx.navigateTo({
+      url: '/pages/Ticket/Ticket',
+    })
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
@@ -58,7 +62,18 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    console.log(app.isLogin)
+    this.setData({
+      isLogin: app.isLogin,
+    })
+    let City = this.selectComponent('#CityComp');
+    City.getCityList();
+    this.GetGroup();
+    this.GetCZTM();
+    this.GetAllTicket();
+    this.getFree();
+    this.getScen();
+    this.getLocal()
   },
   login(){
     wx.navigateTo({

pages/Home/home.wxml

 <!--pages/Home/home.wxml-->
-<view wx:if="{{isLogin!=0}}" class="Home commonF">
+<view class="Home commonF">
   <view id="searchView">
     <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
   </view>
@@ -16,35 +16,35 @@
   <view class="tablist">
     <view>
       <navigator hover-class="Home_hover" url="/pages/GroupTour/GroupTour">
-        <image src="../../images/home/list1.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083338656.png"></image>
         <view>跟团游</view>
       </navigator>
 
     </view>
     <view>
       <navigator hover-class="Home_hover" url="/pages/freeTravel/free">
-        <image src="../../images/home/list2.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083338662.png"></image>
         <view>自由行</view>
       </navigator>
 
     </view>
     <view>
       <navigator hover-class="Home_hover" url="/pages/local/localhome">
-        <image src="../../images/home/list3.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083338755.png"></image>
         <view>当地游</view>
       </navigator>
 
     </view>
     <view>
       <navigator hover-class="Home_hover" url="/pages/visa/visa">
-        <image src="../../images/home/list4.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083504391.png"></image>
         <view>签证</view>
       </navigator>
 
     </view>
     <view>
       <navigator hover-class="Home_hover" url="/pages/Ticket/Ticket">
-        <image src="../../images/home/list5.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083459400.png"></image>
         <view>机票</view>
       </navigator>
 
@@ -94,10 +94,10 @@
     <view>
       <view>
         <text style="font-size:30rpx;color:#000000">特价机票</text>
-        <text style="font-size:24rpx;color:#888888;float:right;margin-top:15rpx">查看更多</text>
+        <text bindtap='goJiPiao' style="font-size:24rpx;color:#888888;float:right;margin-top:15rpx">查看更多</text>
       </view>
       <view style="margin-left:-20rpx;margin-top:23rpx">
-        <view class="tjTicket" wx:for="{{specialAirTicketItem}}" wx:key="index">
+        <view class="tjTicket" wx:for="{{specialAirTicketItem}}" bindtap='goJiPiao' wx:key="index">
           <view class="listLeft">
             {{item.alName}}
           </view>
@@ -222,10 +222,10 @@
 
 </view>
 <!-- 未登录 -->
-<view class="loginOut" wx:if="{{isLogin==0}}">
+<!-- <view class="loginOut" wx:if="{{isLogin==0}}">
   <view class="imgView">
     <image style="width:438rpx;height:215rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710035131045.png"></image>
     <view style="font-size:28rpx">您还没有登录，请登录后查看</view>
     <view bindtap="login" class="loginBtn">去登录</view>
   </view>
-</view>
+</view> -->
\ No newline at end of file

pages/Pay/Pay.js

@@ -14,6 +14,7 @@ Page({
     payway:'',
     codeInfo:{},
     codeshow:false,
+    url: 'OnlinePay_post_GetCodeUrlForAirB2B'
   },
 
   /**
@@ -21,13 +22,28 @@ Page({
    */
   onLoad: function (options) {
     console.log("options", options)
-    // options.tagID = "4";
-    // options.orderId = "27900";
+    // 团
+    if (options.tagID !== "4" && options.tagID !== "-1") {
+      let userinfo = wx.getStorageSync('admin')
+      let info = wx.getStorageSync('payInfoMsg');
+      console.log(info)
+      this.data.Commoditydetails = info;
+      this.data.Commoditydetails.airOrderId = info.orderId;
+      this.data.code.OrderSource = 8;
+      this.data.code.total_fee = info.preferPrice + '';
+      this.data.code.body = info.ltName + '-' + info.startDate;
+      this.data.code.attach = `${77}|${userinfo.customerName}|${info.orderId}|${userinfo.id}|${info.branchId}`;
+      this.setData({
+        Commoditydetails: this.data.Commoditydetails,
+        code: this.data.code,
+        url: "OnlinePay_post_GetCodeUrlForCommonB2B"
+      })
+    }
     // 机票
-    if (options.tagID=="4"){
-      
+    if (options.tagID=="4"){ 
       this.setData({
-        orderId: options.orderId
+        orderId: options.orderId,
+        url: "OnlinePay_post_GetCodeUrlForCommonB2B"
       })
       this.getAirTicket(options.orderId)
     }
@@ -71,7 +87,7 @@ Page({
     let str = e.currentTarget.dataset.num;
     this.data.payway = str ? this.data.payway = str : this.data.payway;
     this.data.code.payway = this.data.payway;
-    app.$api('OnlinePay_post_GetCodeUrlForAirB2B', this.data.code).then(res => {
+    app.$api(this.data.url, this.data.code).then(res => {
       let codeInfo = res;
       this.data.PayOrder = codeInfo.Pay_Order;
       

pages/Ticket/Ticket.js

@@ -51,6 +51,20 @@ Page({
     countryHidden:false,
     type:'',
   },
+  goDetails: function (e){
+    let isLogin = wx.getStorageSync('admin') ? 1 : 0
+    
+    if (isLogin == 0) {
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+      return
+    }
+    let id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/Ticket/TicketOrder/TicketOrder?id=' + id,
+    })
+  },
   // 搜索进入机票列表
   seachTiket: function () {
     let _this = this;

pages/Ticket/Ticket.wxml

@@ -13,7 +13,7 @@
     <view class="city flexb">
       <view style="width:200rpx" bindtap="getCity" data-type="start">出发:{{msg.departureName}}</view>
       <view style="width:53rpx;height:53rpx">
-        <image src='/images/ticket/r1.png'></image>
+        <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084925906.png'></image>
       </view>
       <view style="width:200rpx" bindtap="getCity" data-type="end">目的:{{msg.arrivalName}}</view>
     </view>
@@ -94,10 +94,10 @@
     <text class="text" style="color:#61DCD4"> \ \ \ </text>
     <text class="f30" style="color:#000000;font-weight:600;margin:0 12rpx"> 精选特惠          </text>
     <text class="text" style="color:#61DCD4"> \ \ \</text>
-    <text class="f24" style="color:#888888;position:absolute;right:15rpx"> 查看更多          </text>
+    <!-- <text class="f24" style="color:#888888;position:absolute;right:15rpx"> 查看更多          </text> -->
   </view>
   <view class='JXView'>
-    <view wx:for="{{dataList}}" wx:key="index" class="JxItem">
+    <view wx:for="{{dataList}}" wx:key="index" class="JxItem" data-id='{{item.id}}' bindtap='goDetails'>
       <view class="imgView">
         <image src='{{item.airlineUrl}}'></image>
       </view>

pages/Ticket/TicketList/TicketList.js

@@ -90,7 +90,16 @@ Page({
     })
   },
   // 跳转下订单页面
-  setOreder: function (e){
+  setOreder: function (e){ 
+    let isLogin = wx.getStorageSync('admin') ? 1 : 0
+    console.log(isLogin)
+    if (isLogin == 0) {
+
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+      return
+    }
     let id = e.currentTarget.dataset.id
     wx.navigateTo({
       url: '/pages/Ticket/TicketOrder/TicketOrder?id=' + id,

pages/Ticket/TicketOrder/TicketOrder.js

@@ -189,7 +189,7 @@ Page({
   onLoad: function (options) {
     wx.removeStorage({
       key: 'Addppdate',
-      success: function (res) { },
+      success: function (res) {},
     })
     console.log(options)
     let userInfo = wx.getStorageSync('admin');

pages/Ticket/TicketOrder/TicketOrder.wxml

@@ -72,7 +72,7 @@
       <text class='f22 c55 margin-left15' bindtap='priceBoxShow'>明细 ∧</text>
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">去付款</view>
   </view>

pages/Voucher/VoucherDetails/VoucherDetails.wxml

@@ -34,7 +34,7 @@
   <view class='dialog' wx:if="{{showYouJi}}">
     <view class='box'>
       <view class='tit'>感谢参与调查</view>
-      <image src='../../../images/voucher/xieyouji_icon.png'></image>
+      <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084607628.png'></image>
       <view class='btn'>
         <button class='next' type="default" size="mini" bindtap="goWrite">写游记，领奖品</button>
       </view>
@@ -49,7 +49,7 @@
   <view class='dialog' wx:if="{{showBadYouJi}}">
     <view class='box'>
       <view class='tit'>感谢参与调查</view>
-      <image src='../../../images/voucher/xieyouji_icon.png'></image>
+      <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084607628.png'></image>
       <view class='tips'>
         非常感谢您的配合，祝您生活愉快~
       </view>

pages/Voucher/write/write.wxml

@@ -33,8 +33,7 @@
   </view>
   <view class='dialog' wx:if="{{showBadYouJi}}">
     <view class='box'>
-      <view class='tit'>感谢参与调查</view>
-      <!-- <image src='../../../images/voucher/xieyouji_icon.png'></image> -->
+      <view class='tit'>感谢参与调查</view> 
       <view class='ActivateCode'>
         <text class='code'>{{ActivateCode}}</text><text class='copy_btn' bindtap='copyText'>复制</text>
       </view>

pages/local/FoodOrder/FoodOrder.wxml

@@ -22,7 +22,7 @@
 
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">确认订单</view>
   </view>

pages/local/TicketOrder/TicketOrder.wxml

@@ -48,13 +48,10 @@
   <view class="{{GoodsView?'payFixed PayView':'PayView'}}">
     <view style="width:400rpx;">
       <text class="f20">总价:￥</text>
-      <text class="f46 cee">{{SettlementPrice}}</text>
-      <!-- <text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text> -->
-      <!-- <image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image> -->
-
+      <text class="f46 cee">{{SettlementPrice}}</text> 
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">确认订单</view>
   </view>

pages/login/login.js

@@ -85,6 +85,7 @@ Page({
                   id: res.id
                 }
               })
+              console.log("登录页面", app.isLogin)
               wx.navigateBack({
                 delta: 1
               })

pages/login/login.wxml

@@ -7,7 +7,7 @@
       <image class="headBgImg" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190716034157622.png"></image>
 
       <view class='header'>
-        <image class='header_image' src='../../images/login/logo.png'></image>
+        <image class='header_image' src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083603068.png'></image>
         <text class='header_text'>welcome</text>
       </view>
       <view class='form'>

pages/member/member.js

@@ -12,6 +12,55 @@ Page({
     gap: 0,
     nextExp: 0,
     isLogin: false,
+    outNum: 0,
+  },
+
+  /**
+   * 退出显示计数
+   */
+  outNumUp: function () {
+    let num = this.data.outNum
+    if (num >= 4) {
+      num = 0
+    } else {
+      num = num + 1
+    }
+    this.setData({
+      outNum: num
+    })
+    this.loginOut()
+  },
+  // 登录
+  login: function (){
+    wx.navigateTo({
+      url: '/pages/login/login',
+    })
+  },
+  /**
+   * 退出登录
+   */
+  loginOut: function () {
+    wx.removeStorage({
+      key: 'admin',
+      success: res => {
+        this.setData({
+          isLogin: false
+        })
+        app.state.admin.account = ''
+        app.state.admin.address = ''
+        app.state.admin.businessCardPhotos = null
+        app.state.admin.contact = ''
+        app.state.admin.customerAccountId = 0
+        app.state.admin.housePhotos = null
+        app.state.admin.images = null
+        app.state.admin.isMember = 0
+        app.state.admin.name = ''
+        app.state.admin.photo = ''
+        app.state.admin.secretKey = ''
+        app.state.admin.token = ''
+        app.state.admin.id = ''
+      }
+    })
   },
   formSubmit: function (e) {
     wx.getStorage({
@@ -71,7 +120,24 @@ Page({
       this.getUserMemberExp()
     }
   },
+  draw: function () {
+    // this.data.contactNumber
+    let userinfo = wx.getStorageSync('admin')
+    app.$api('b2b_post_MiniProgramGetAccountInfoByPhone', { account: userinfo.account, }).then(res => {
+      var token = res.token;
+      var secretKey = res.secretKey;
+      var uid = res.customerId;
+      var groupId = res.groupId;
 
+      // wx.reLaunch({
+      wx.navigateTo({
+        url: '/pages/product/SametradeZW/luckdraw/luckdraw?token=' + token + '&secretKey=' + secretKey + '&uid=' + uid + '&groupId=' + groupId,
+      })
+    }).catch(err => {
+
+    })
+
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/member/member.wxml

 <view class='page'>
   <view class='page__bd'>
-    <view wx:if="{{isLogin==false}}" class='mine1'>
-      <view class='mine1_text'>登录行程助理账号后，您可查看对应信息</view>
-      <navigator class='mine1_btn' open-type="navigate" url="/pages/login/login">立即登录</navigator>
+    <view wx:if="{{isLogin==false}}" class='mine1 loginOut'>
+      <view class="imgView">
+        <image style="width:438rpx;height:215rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710035131045.png"></image>
+        <view style="font-size:28rpx">您还没有登录，请登录后查看</view>
+        <view bindtap="login" class="loginBtn">去登录</view>
+      </view>
     </view>
     <!-- 个人信息 -->
     <view wx:else class='mine2'>
@@ -47,9 +50,9 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> 
     <!-- 订单菜单 个人菜单-->
-    <view class='bottom-box'>      
+    <view class='bottom-box'>
       <view class='order-menu'>
         <view class='order-menu-tit'>
           <view>我的近期订单</view>
@@ -104,6 +107,9 @@
           </view>
         </view>
       </view>
+      <view class='advertisement' bindtap='draw' catchtouchmove="doNothing">
+        <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190625044635970.png'></image>
+      </view>
       <view class='order-menu order-menu2'>
         <view class='order-menu-tit'>
           <view>个人菜单</view>
@@ -157,6 +163,14 @@
               </button>  
             </form>
           </view>
+          <view>
+            <form bindsubmit="formSubmit" report-submit> 
+               <button hover-class="btn-hover" form-type="submit" data-url="/pages/mine/Happypassbook/Happypassbook">
+                <image mode="aspectFit" src="../../images/menber/menu-hong.png"></image>
+                <view class='order-type-name'>旅客调查</view>
+              </button>  
+            </form>
+          </view>
         </view>
       </view> 
     </view>

pages/member/member.wxss

@@ -241,7 +241,7 @@ button:active{
   color: #666666;
 }
 .order-menu2{
-  margin-top: 50rpx;
+  margin-top: 20rpx;
 }
 .order-menu2 image{
   width: 54rpx;
@@ -249,3 +249,48 @@ button:active{
 .btn-hover{
   background-color: transparent;
 }
+.advertisement{
+  height: 200rpx;
+  box-shadow:1px 1px 3px 3px #d2d2d2;
+  margin: 5px 0;
+  border-radius: 5px;
+  margin-top: 20rpx
+
+  
+}
+.advertisement image{
+  width: 100%;
+  height: 100%;
+  border-radius: 5px
+}
+.loginOut {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  background: #fff;
+  z-index: 3000;
+}
+.imgView{
+  text-align: center;
+  width: 500rpx;
+  height: 600rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+}
+.loginOut .loginBtn {
+  display: inline-block;
+  margin-top:24rpx;
+  width: 127rpx;
+  height: 58rpx;
+  background: rgba(238, 68, 84, 1);
+  border-radius: 4rpx;
+  font-size: 24rpx;
+  color: #fff;
+  text-align: center;
+  line-height: 58rpx;
+}
\ No newline at end of file

pages/member/orderCenter/orderCenter.js

@@ -118,10 +118,17 @@ Page({
     tagID: 4,
     tagIndex: 0,
   },
-  // 签证取消订单
+  // 团 支付跳转
+  goTuanPay(e) {
+    let payInfoMsg = e.currentTarget.dataset.item; 
+    wx.setStorageSync('payInfoMsg', payInfoMsg)
+    wx.navigateTo({
+      url: '/pages/Pay/Pay?tagID=' + this.data.tagID,
+    })
+  },
   // 门票美食签证跳转支付
   goCommonPay(e){
-    let payInfoMsg = e.currentTarget.dataset.item.payInfo;
+    let payInfoMsg = e.currentTarget.dataset.item.payInfo; 
     wx.setStorageSync('payInfoMsg', payInfoMsg)
     wx.navigateTo({
       url: '/pages/Pay/Pay?tagID=-1',

pages/member/orderCenter/orderCenter.wxml

@@ -18,7 +18,6 @@
     </view>
   </view>
   <scroll-view class='data_body' scroll-y bindscrolltolower="scrollGetMore">
-  （{{tagID}}）
     <view wx:if="{{tagID !== 6 && tagID !== 8 && tagID !== 4 && tagID !== 5}}">
       <view class='list-item' wx:for="{{dataList}}" wx:for-item="item" wx:key="index" wx:for-index="index">
       <!-- <form bindsubmit="formSubmit" report-submit> 
@@ -44,7 +43,7 @@
             <view class='list-item-btn'>
               <view wx:if="{{item.orderState == 1}}">联系客服</view>
               <view wx:if="{{item.orderState == 3 || item.orderState == 2}}">取消订单</view>
-              <view catchtap="endPaoPao" data-item="{{item}}" wx:if="{{item.orderState == 1 || item.orderState == 2}}"  class='btn-red'>付款</view>
+              <view catchtap="goTuanPay" data-item="{{item}}" wx:if="{{item.orderState == 1 || item.orderState == 2}}"  class='btn-red'>付款</view>
               <!-- <view class='btn-red'>确认收货</view> -->
               <view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view>
             </view>

pages/mine/Happypassbook/Happypassbook.wxml

 <view class="commonF Happy" id="Red">
-  <image class="xfcz" src="/images/mine/xfcz.png"></image>
+  <image class="xfcz" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719081503444.png"></image>
   <view class="banner">
     <view class="bannerView">
       <view class="leftView">
@@ -7,7 +7,7 @@
         <view style="font-size:70rpx">￥{{datainfo.Client_Balance}}</view>
       </view>
       <view class="rightView" style="width:235rpx;height:238rpx">
-        <image src="/images/mine/t2.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719081419875.png"></image>
       </view>
     </view>
     <view class="bannerbottom">

pages/product/SametradeZW/SametradeZW.wxml

@@ -10,7 +10,7 @@
           <text class='t_time_t'>{{Detaildata.QStartDate}}</text>
         </view>
       </view>
-      <image class='division' src='../../../images/product/yangs.png'></image>
+      <image class='division' src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085036789.png'></image>
       <view class='zw_information'>
         <view class='zw_Price'>
           <text class='zw_Price_l'>结算价格</text>

pages/product/SametradeZW/Successview/Successview.js

@@ -16,6 +16,11 @@ Page({
     token:'',
     contactNumber:'',
   },
+  goHappyPrice: function (){
+    wx.navigateTo({
+      url: '/pages/mine/Happypassbook/Happypassbook',
+    })
+  },
   onLoad: function (option){
     let contactNumber= option.contactNumber
     this.setData({ contactNumber: contactNumber})

pages/product/SametradeZW/Successview/Successview.wxml

@@ -10,7 +10,7 @@
             <view class='img_ti'>
               <text>!</text>
             </view>
-            <text class='content_ts'>特别提示</text>
+            <text class='content_ts'>特别提示</text>
         </view>
 
         <view class='content_c'>
@@ -36,6 +36,9 @@
     <view class='advertisement' bindtap='draw_t' catchtouchmove="doNothing">
       <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190625044636072.jpg'></image>
     </view>
+    <view class='advertisement' bindtap='goHappyPrice' catchtouchmove="doNothing">
+      <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719071419291.png'></image>
+    </view>
   </view>
   <view style="width: 100%;height : 50px"></view>
 

pages/product/product.wxml

@@ -2,9 +2,6 @@
   <view class='page__bd'>
     <view class='header'>
       <view class='header_check'>
-      <!-- <navigator url='SametradeZW/SametradeZW'>
-       <text class='header_check_in_text'>占位跳转临时使用</text>
-      </navigator> -->
         <navigator url="productCheck/productCheck" class='header_check_in' hover-class="none">
           <text class='header_check_in_text'>目的地、旅游路线</text>
           <image class='header_check_in_image' src='../../images/product/product_ico_search.png'></image>
@@ -17,18 +14,6 @@
       </view>
     </view>
     <view class='scroll_body'>
-      <!-- <view class='todayNews'>
-        <image class='todayNews_image' src='../../images/product/todayNews.png'></image>
-        <swiper class='todayNews_swiper' vertical="{{true}}" autoplay="{{true}}" circular="{{true}}">
-          <block wx:for="{{todayHead}}" wx:key="index">
-            <swiper-item class="todayNews_swiper_item" catchtouchmove="stopTouchMove">
-              <image class='todayNews_swiper_image' src='../../images/product/hot.png'></image>
-              <text class='todayNews_swiper_text'>{{item.name}}</text>
-            </swiper-item>
-          </block>
-        </swiper>
-        <text class='todayNews_more' bindtap='todayMove'>更多</text>
-      </view> -->
       <block wx:for="{{recommendList}}" wx:for-item="item" wx:for-index="index1" wx:key="index1">
         <view class="weui-panel weui-panel_access">
           <view class="weui-panel__hd">
@@ -55,17 +40,12 @@
                   <view class="weui-media-box__date weui-media-box__date2">
                     <text class='weui-media-box__date__text'>航班: {{item2.alName}}(余位：{{item2.surplus}})</text>
                   </view>
-                  <!-- hidden='{{account===""}}' -->
                   <view >
-                  <!-- wx:if="{{isMember===1}}" -->
                     <view class="weui-media-box__desc" wx:if="{{isMember===1}}">
                       统一售价：<text class="weui-media-box__desc__up">{{item2.b2BPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
                     </view>
                     <view class="weui-media-box__desc" wx:else>
                       统一售价：<text class="weui-media-box__desc__up">{{item2.b2CPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
-                      <text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
                     </view>
                   </view>
                 </view>
@@ -100,22 +80,13 @@
                   <view class="weui-media-box__date weui-media-box__date2">
                     <text class='weui-media-box__date__text'>航班: {{item2.alName}}(余位：{{item2.surplus}})</text>
                   </view>
-                  <!-- hidden='{{account===""}}' -->
                   <view >
-                  <!-- wx:if="{{isMember===1}}" -->
                     <view class="weui-media-box__desc" wx:if="{{account=== ''}}">
                       统一售价1：<text class="weui-media-box__desc__up">{{item2.b2BPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
                     </view>
                     <view class="weui-media-box__desc" wx:else>
                       统一售价2：<text class="weui-media-box__desc__up">{{item2.b2CPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
-                      <text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
                     </view>
-                    <!-- <view class="weui-media-box__desc" wx:else>
-                      <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
-                      <text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text>
-                    </view> -->
                   </view>
                 </view>
               </navigator>

pages/product/productCheck/productCheck.wxml

@@ -60,29 +60,13 @@
                     <text class='weui-media-box__date__text'>航班: {{item.alName}}(余位：{{item.surplus}})</text>
                   </view>
                   <view >
-                  <!-- wx:if="{{isMember===1}}" -->
                     <view class="weui-media-box__desc" wx:if="{{account=== ''}}">
                       统一售价：<text class="weui-media-box__desc__up">{{item.b2BPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__down">¥{{item2.b2CMemberPrice}}</text> -->
                     </view>
                     <view class="weui-media-box__desc" wx:else>
                       统一售价：<text class="weui-media-box__desc__up">{{item.b2CPrice}}</text>
-                      <!-- <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
-                      <text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text> -->
                     </view>
-                    <!-- <view class="weui-media-box__desc" wx:else>
-                      <text class="weui-media-box__desc__up">{{account=== "" ? item2.b2CPrice : item2.b2BPrice}}</text>
-                      <text class="weui-media-box__desc__down">¥{{item2.b2CPrice}}</text>
-                    </view> -->
                   </view>
-                  <!-- <view class="weui-media-box__desc" wx:if="{{isMember===1}}">
-                    <text class="weui-media-box__desc__up">{{item.b2BMemberPrice}}</text>
-                    <text class="weui-media-box__desc__down">¥{{item.b2CMemberPrice}}</text>
-                  </view>
-                  <view class="weui-media-box__desc" wx:else>
-                    <text class="weui-media-box__desc__up">{{account=== "" ? item.b2CPrice : item.b2BPrice}}</text>
-                    <text class="weui-media-box__desc__down">¥{{item.b2CPrice}}</text>
-                  </view> -->
                 </view>
               </navigator>
             </block>

pages/product/productDetail/productDetail.wxml

@@ -208,17 +208,17 @@
                 <!-- 餐饮 -->
                 <view class='view_2_diet'>
                   <view class='view_2_diet_line'>
-                    <image class='view_2_diet_line_image' src='../../../images/product/ico_breakfast.png'></image>
+                    <image class='view_2_diet_line_image' src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085036704.png'></image>
                     <text class='view_2_diet_line_title'>早餐</text>
                     <text class='view_2_diet_line_content'>{{item.can.breakfirst}}</text>
                   </view>
                   <view class='view_2_diet_line'>
-                    <image class='view_2_diet_line_image' src='../../../images/product/ico_lunch.png'></image>
+                    <image class='view_2_diet_line_image' src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085036760.png'></image>
                     <text class='view_2_diet_line_title'>午餐</text>
                     <text class='view_2_diet_line_content'>{{item.can.lanuch}}</text>
                   </view>
                   <view class='view_2_diet_line'>
-                    <image class='view_2_diet_line_image' src='../../../images/product/ico_dinner.png'></image>
+                    <image class='view_2_diet_line_image' src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085139306.png'></image>
                     <text class='view_2_diet_line_title'>晚餐</text>
                     <text class='view_2_diet_line_content'>{{item.can.dinner}}</text>
                   </view>

pages/visa/visa.wxml

@@ -41,7 +41,7 @@
     </view>
   </view>
   <view class="CommonVTile">
-    <image style="width:30rpx;height:22rpx" src='/images/visa/t1.png'></image>
+    <image style="width:30rpx;height:22rpx" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342639.png'></image>
     <text class="f30 bold">限时优惠</text>
   </view>
   <view class="VisaView">
@@ -80,7 +80,7 @@
     </view> -->
   </view>
   <view class="CommonVTile">
-    <image style="width:30rpx;height:22rpx" src='/images/visa/t1.png'></image>
+    <image style="width:30rpx;height:22rpx" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342639.png'></image>
     <text class="f30 bold">热门国家</text>
     <text class="f24" style="color:#888888;float:right" bindtap='goListPage'>查看更多</text>
   </view>
@@ -94,7 +94,7 @@
     </view>
   </view>
   <view class="CommonVTile">
-    <image style="width:30rpx;height:22rpx" src='/images/visa/t1.png'></image>
+    <image style="width:30rpx;height:22rpx" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342639.png'></image>
     <text class="f30 bold">热门签证</text>
     <text class="f24" style="color:#888888;float:right" bindtap='goListPage'>查看更多</text>
   </view>

pages/visa/visaChDate/visaChDate.wxml

@@ -21,7 +21,7 @@
       <text class="f20 c88">/人</text>
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view> 
     <view bindtap='StartYd' class="startPay">确定</view>
   </view>

pages/visa/visaDetails/visaDetails.js

@@ -11,7 +11,16 @@ Page({
     dataList: {},
     visaId: null
   },
-  StartYd: function () {
+  StartYd: function () { 
+    let isLogin = wx.getStorageSync('admin') ? 1 : 0
+    console.log(isLogin)
+    if (isLogin == 0) {
+
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+      return
+    }
     let id = this.data.visaId
     wx.navigateTo({
       url: '/pages/visa/visaChDate/visaChDate?id=' + encodeURIComponent(id) + '&visaB2CPrice=' + this.data.dataList.visaB2CPrice + '&visaPrice=' + this.data.dataList.visaPrice,
@@ -40,7 +49,7 @@ Page({
       if (res.coverImageList.length) {
         imgList = res.coverImageList
       } else {
-        imgList.push("/images/visa/bg_c2@3x.png")
+        imgList.push("http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083952562.png")
       }
       this.setData({
         imgList: imgList,

pages/visa/visaDetails/visaDetails.wxml

@@ -108,7 +108,7 @@
       <view class='info-content'>
         <view>
           <view>
-            <image src='../../../images/visa/yuding.png'></image>
+            <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084258112.png'></image>
           </view>
           <view class="number">
             <text>1</text>
@@ -117,7 +117,7 @@
         </view>
         <view>
           <view>
-            <image src='../../../images/visa/cailiao.png'></image>
+            <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719083952583.png'></image>
           </view>
           <view class="number">
             <text>2</text>
@@ -126,7 +126,7 @@
         </view>
         <view>
           <view>
-            <image src='../../../images/visa/shenhe.png'></image>
+            <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084258103.png'></image>
           </view>
           <view class="number">
             <text>3</text>
@@ -135,7 +135,7 @@
         </view>
         <view>
           <view>
-            <image src='../../../images/visa/banli.png'></image>
+            <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084258088.png'></image>
           </view>
           <view class="number">
             <text>4</text>
@@ -144,7 +144,7 @@
         </view>
         <view>
           <view>
-            <image src='../../../images/visa/songqian.png'></image>
+            <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719084742129.png'></image>
           </view>
           <view class="number">
             <text>5</text>
@@ -162,7 +162,7 @@
       <text class="f20 c88">/人起</text>
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">开始预定</view>
   </view>

pages/visa/visaOrder/visaOrder.js

@@ -121,7 +121,9 @@ Page({
     console.log(this.data.saveMsg)
     app.$api('b2b_get_SetB2BVisaOrder', this.data.saveMsg).then(res => {
       console.log(res)
-      
+      wx.redirectTo({
+        url: '/pages/member/orderCenter/orderCenter?index=4',
+      })
     }).catch(err => { });
   },
   //确认收货地址

pages/visa/visaOrder/visaOrder.wxml

@@ -122,7 +122,7 @@
       <text class="f20 ">/人起</text>
     </view>
     <view style="width:100rpx;border-left:1px solid #E9E9E9;padding-top:29rpx;">
-      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+      <image style="width:45rpx;height:45rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190719085342588.png"></image>
     </view>
     <view bindtap='StartYd' class="startPay">开始预定</view>
   </view>