Browse Source

Merge branch 'dev' into AnHuiRelese_4.1.2

tags/安徽版C.4.1.6最终版
meo 6 years ago
parent
commit
6137b2a86a
6 changed files with 8 additions and 8 deletions
  1. +3
    -3
      ext.json
  2. +1
    -1
      pages/coupon/detail/index.wxml
  3. +1
    -1
      pages/coupon/detail/index.wxss
  4. +1
    -1
      pages/main/bargain/index.wxml
  5. +1
    -1
      pages/main/spellGroup/index.wxml
  6. +1
    -1
      project.config.json

+ 3
- 3
ext.json View File

@@ -8,9 +8,9 @@
"attr": {
"ifHaveCarModular": "1",
"etcpversion": "release",
"configUrl": "https://c.malls.iformall.com/C/api",
"passCarAppId": "wxc07f9d67923d676d",
"passCarreturnUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
"configUrl": "https://ciformall.youlane.cn/C/api",
"passCarAppId": "wx192b7d2e8dcbefd0",
"passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback"
}
},
"permission": {


+ 1
- 1
pages/coupon/detail/index.wxml View File

@@ -117,7 +117,7 @@
<!-- 问卷调查 -->
<view class="b1" style="opacity:{{opacity}};display: {{display}};" animation="{{queueData}}">
<view id='con' class='con'>
<image class='close' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image>
<image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image>
<image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image>
<image class='image' src="{{headbgUrl}}" mode='widthFix'></image>
<image class='img image' src="{{quesBgUrl}}" mode='widthFix'></image>


+ 1
- 1
pages/coupon/detail/index.wxss View File

@@ -458,7 +458,7 @@ button::after{ border: none; }
border-bottom: 0;
}

.close {
.wmclose {
position: relative;
z-index: 10000;
display: block;


+ 1
- 1
pages/main/bargain/index.wxml View File

@@ -1,5 +1,5 @@
<view class="index-rushToBuy" wx:if="{{list.length>0}}">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">砍价专场<text bindtap="gotomore" wx:if="{{list.length>=4}}">更多砍价></text></view>
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">砍价专场<text bindtap="gotomore">更多砍价></text></view>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{list}}" wx:key="unique">
<view bindtap="gotodetail" data-couponChannelId="{{item.id}}" data-couponId="{{item.couponId}}" data-targetAd="{{item.targetAd}}">


+ 1
- 1
pages/main/spellGroup/index.wxml View File

@@ -1,5 +1,5 @@
<view class="index-rushToBuy" wx:if="{{list.length>0}}">
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">拼团专场<text bindtap="gotomore" wx:if="{{list.length>=4}}">更多拼团></text></view>
<view wx:if="{{list.length!=0}}" class="index-rushToBuy-title">拼团专场<text bindtap="gotomore">更多拼团></text></view>
<scroll-view scroll-x class="index-scroll-view">
<view class="commodity" wx:for="{{list}}" wx:key="unique">
<view bindtap="gotodetail" data-couponChannelId="{{item.id}}" data-couponId="{{item.couponId}}" data-targetAd="{{item.targetAd}}">


+ 1
- 1
project.config.json View File

@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.2.0",
"appid": "wx453ae0d37f3550d0",
"appid": "wxb11603577a84a86d",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false,
"condition": {


Loading…
Cancel
Save