update

Common.wxss

@@ -130,19 +130,6 @@ image{
   height:262rpx;
   border-radius:12rpx;
 }
-.commonF .cztm>view .rbzc{
-  position: absolute;
-  top: 0;
-  left: 0;
-  width:110rpx;
-  background:rgba(255,0,0,1);
-  border-radius:12rpx 0 12rpx 0;
-  text-align: center;
-  color: #fff;
-  font-size: 20rpx;
-  padding: 5rpx 15rpx;
-
-}
 .commonF .cztm>view{
   display: inline-block;
   position: relative;

pages/Home/home.js

@@ -24,13 +24,17 @@ Page({
     localList:[],
   }, 
   goWebView(){
+    let type=1;
     let userinfo= wx.getStorageSync('admin');
     if (!userinfo){
       util.shownone("请先登录！");
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
       return;
     }
     wx.navigateTo({
-      url:'/pages/webview/webview'
+      url: '/pages/webview/webview?type=' + type
     })
   },
   draw: function () {

pages/Home/home.wxml

@@ -75,7 +75,6 @@
     <view class="cztm cztm1">
       <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList1" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index==0}}">
         <image src="{{item.imgCover[0].url}}"></image>
-        <view class="rbzc">日本专场</view>
         <view class="boxshadow">
           <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
           <view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
@@ -83,7 +82,6 @@
       </view>
       <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index==1}}">
         <image src="{{item.imgCover[0].url}}"></image>
-        <view class="rbzc">日本专场</view>
 
         <view class="boxshadow">
           <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
@@ -95,7 +93,6 @@
     <view class="cztm cztm2">
       <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index>1 && index<5}}">
         <image src="{{item.imgCover[0].url}}"></image>
-        <view class="rbzc">日本专场</view>
         <view class="boxshadow">
           <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
           <view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>

pages/Home/pay/pay.js

@@ -11,7 +11,7 @@ Page({
     customerId: '',
     payInfo: {},
     payBtn: true,
-    second: 180,
+    second: 60,
     changesecond: true,
     dataInfo:{},
   },
@@ -56,7 +56,6 @@ Page({
     };
     app.$api('sellorder_get_GetPayInfo', msg).then(res => {
       let data=JSON.parse(res);
-      console.log("data", res);
       that.setData({
         dataInfo: data
       })
@@ -98,8 +97,11 @@ Page({
         if (res.errMsg == "requestPayment:ok") {
           util.shownone('支付成功');
           wx.navigateTo({
-            url: '/pages/Home/payOk/payOk'
+            url: '/pages/webview/webview?type=2'
           })
+          // wx.navigateTo({
+          //   url: '/pages/Home/payOk/payOk'
+          // })
 
         }
       }

pages/member/Coupon/Coupon.js

@@ -6,9 +6,13 @@ Page({
    */
   data: {
     active: 0,
-    dropdownActive: 0,
+    dropdownActive: 2,
     tagBoxShow: false,
     dropdown: [
+      {
+        id: 0,
+        name: '不限'
+      },
       {
         id: 1,
         name: '通用'
@@ -42,7 +46,7 @@ Page({
       {
         id: 0,
         Status: 1,
-        name: '全部优惠券'
+        name: '全部'
       },
       {
         id: 2,
@@ -70,7 +74,7 @@ Page({
       couponsType: "",
       couponStatus: 1,
       couponEffectStatus: 1,
-      couponsUseScope: 1
+      couponsUseScope: 2
     },
     dataList: [],
     pageIndex: 1,

pages/member/Coupon/Coupon.wxml

@@ -19,7 +19,9 @@
   </view>
   <scroll-view class='data_body' scroll-y bindscrolltolower="scrollGetMore">
     <view wx:for="{{dataList}}" wx:for-index="index" wx:for-item="item" wx:key="index" class='item {{item.couponEffectStatus!=1? "guoqi" :""}}'>
-      <view class='left' style="background: url({{item.couponEffectStatus!=1? '../../../images/menber/quanbg_8.png' : '../../../images/menber/quanbg_0'+ item.couponsUseScope +'.png'}}) no-repeat; background-size: 100% 100%;">
+      <view class='left'>
+        <image class="bgImg" wx:if="{{item.couponEffectStatus!=1}}" src="../../../images/menber/quanbg_8.png"></image>
+        <image wx:else class="bgImg" src="{{'../../../images/menber/quanbg_0'+ item.couponsUseScope+'.png'}}"></image>
         <view class='coupom_type' wx:if="{{item.couponsType == 1}}">
           <view class='price' >
             ￥<text>{{item.denomination}}</text>
@@ -41,6 +43,7 @@
         <view>
           <text class='tit'>{{item.couponsName}}</text>
           <block>
+          <text class='tag tag{{item.couponsUseScope}}' wx:if="{{item.couponsUseScope == 0}}">不限</text>
             <text class='tag tag{{item.couponsUseScope}}' wx:if="{{item.couponsUseScope == 1}}">通用</text>
             <text class='tag tag{{item.couponsUseScope}}' wx:if="{{item.couponsUseScope == 2}}">跟团游</text>
             <text class='tag tag{{item.couponsUseScope}}' wx:if="{{item.couponsUseScope == 3}}">签证</text>

pages/member/Coupon/Coupon.wxss

@@ -17,6 +17,14 @@ page{background-color: #F8F5F5}
   width: 146rpx;
   height: 143rpx;
   margin-right: 31rpx;
+  position: relative;
+}
+.data_body .item .left .bgImg{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 .data_body .item .right{
   flex: 1;
@@ -91,7 +99,6 @@ page{background-color: #F8F5F5}
 }
 .top-nav{
   position: fixed;
-  z-index: 10;
   top: 0repx;
   left: 0rpx;
   width: 100%;
@@ -100,6 +107,7 @@ page{background-color: #F8F5F5}
   color: #000000;
   box-shadow:0px 2px 18px 0px rgba(177,177,177,1);
   background-color: white;
+  z-index:2000;
 }
 .left-btn{
   position: absolute;
@@ -165,7 +173,9 @@ page{background-color: #F8F5F5}
 }
 .coupom_type{
   text-align: center;
-  color: white
+  color: white;
+  position: relative;
+  z-index: 200;
 }
 .coupom_type .price{
   margin: 15rpx 0 0 0;

pages/webview/webview.js

@@ -10,19 +10,30 @@ Page({
     
   },
   onLoad: function (options) {
+    console.log("options", options)
+    let urlHref ="";
     let admin = wx.getStorageSync('admin');
     let customerId = admin.id;
     let accountId = admin.customerAccountId;
     let token = admin.token;
     let secretKey = admin.secretKey;
     let platform = "xcx";
-    let src = "http://activity.oytour.com/html/GT_activities.html";
-    // let src ="http://127.0.0.1:5500/html/GT_activities.html";
-    let urlHref = src + "?customerId=" + customerId + '&accountId=' + accountId + '&token=' + token + '&secretKey=' + secretKey + '&platform=' + platform;
+    let commonUrl = "?customerId=" + customerId + '&accountId=' + accountId + '&token=' + token + '&secretKey=' + secretKey + '&platform=' + platform;
+    if (options.type && options.type=="1"){ 
+      let src = "https://activity.oytour.com/html/GT_activities.html";
+      // let src = "http://127.0.0.1:5500/html/GT_activities.html";
+      urlHref = src + commonUrl;
 
+    }else{
+      // let src ="http://127.0.0.1:5500/html/paySuccess.html"
+      let src = "https://activity.oytour.com/html/paySuccess.html";
+      urlHref = src + commonUrl;
+    }
     this.setData({
       urlHref: urlHref
     })
+    
+    console.log("urlHref", urlHref)
   },
 
 })
\ No newline at end of file

pages/webview/webview.wxml

-<web-view src="{{urlHref}}"></web-view>
\ No newline at end of file
+<web-view src="{{urlHref}}"></web-view>

project.config.json

@@ -228,6 +228,27 @@
 					"pathName": "pages/Home/payOk/payOk",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "优惠券",
+					"pathName": "pages/member/Coupon/Coupon",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 26,
+					"name": "登录",
+					"pathName": "pages/login/login",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "webview",
+					"pathName": "pages/webview/webview",
+					"query": "",
+					"scene": null
 				}
 			]
 		}