| @@ -37,7 +37,7 @@ | |||
| <view class='pintuan' wx:if="{{pSize}}" bindtap="gotoptdetail" data-couponId='{{pData.couponId}}' data-couponChannelId="{{pData.id}}" data-targetAd="{{pData.targetAd}}"> | |||
| <view> | |||
| <image mode='aspectFill' lazy-load='true' src="{{pData.coverImg}}" /> | |||
| <image class="img" mode='aspectFill' lazy-load='true' src="{{pData.coverImg}}" /> | |||
| </view> | |||
| <view class='ptText'> | |||
| <text class='title'>{{pData.title}}</text> | |||
| @@ -1,7 +1,6 @@ | |||
| const app = getApp() | |||
| Component({ | |||
| properties: { | |||
| background: { | |||
| type: String, | |||
| @@ -21,7 +20,7 @@ Component({ | |||
| }, | |||
| back: { | |||
| type: Boolean, | |||
| value: true | |||
| value: false | |||
| }, | |||
| home: { | |||
| type: Boolean, | |||
| @@ -51,16 +50,31 @@ Component({ | |||
| }) | |||
| }, | |||
| back: function () { | |||
| wx.navigateBack({ | |||
| delta: 1 | |||
| }) | |||
| // wx.navigateBack({ | |||
| // delta: 1 | |||
| // }) | |||
| const pages = getCurrentPages(); | |||
| console.log(`页面栈:${JSON.stringify(pages)}`, pages.length); | |||
| if (pages.length === 2) { | |||
| wx.navigateBack({ | |||
| delta: 1 | |||
| }); | |||
| } else if (pages.length === 1) { | |||
| wx.reLaunch({ | |||
| url: '/pages/theme/index1/index', | |||
| }) | |||
| } else { | |||
| wx.navigateBack({ | |||
| delta: 1 | |||
| }); | |||
| } | |||
| } | |||
| }, | |||
| attached: function () { | |||
| let pages = getCurrentPages(); | |||
| if (pages.length <= 1) { | |||
| this.setData({ | |||
| home: true, | |||
| back: false | |||
| }) | |||
| } | |||
| @@ -3,10 +3,10 @@ | |||
| <view class='title-container'> | |||
| <view class='capsule' wx:if="{{ back || home}}"> | |||
| <view class="view" bindtap='back' wx:if="{{back}}"> | |||
| <image class="img" style="left:36%;" src='img/back.svg'></image> | |||
| <image class="img" style="left:36%;" src='img/back.svg'></image> | |||
| </view> | |||
| <view bindtap='backHome' wx:if="{{home}}"> | |||
| <image src='img/home.svg' style="width:90%;"></image> | |||
| <view class="view" bindtap='backHome' wx:if="{{home}}"> | |||
| <image class="img" src='img/home.svg' style="width:90%;"></image> | |||
| </view> | |||
| </view> | |||
| <view class='title' style="color:{{color}}!important">{{text}}</view> | |||
| @@ -2,46 +2,35 @@ | |||
| "ext": { | |||
| "attr": { | |||
| "car": { | |||
| "tjd": { | |||
| "payPath": "", | |||
| "tjdAppId": "wx6945d1bda68d7993" | |||
| }, | |||
| "etcp": { | |||
| "payPath": "pages/pay/order-pay-open/main", | |||
| "etcpAppId": "wxc07f9d67923d676d", | |||
| "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||
| }, | |||
| "bolink": { | |||
| "payPath": "pages/park/park", | |||
| "bolinkAppId": "wxbd08b4baa10fcc1d" | |||
| }, | |||
| "version": "release" | |||
| "etcpAppId": "wx192b7d2e8dcbefd0", | |||
| "etcpVersion": "release", | |||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||
| } | |||
| }, | |||
| "mchId": "1623869862", | |||
| "mchId": "1604439800", | |||
| "imgProxy": [ | |||
| { | |||
| "newUrl": "https://c.malls.iformall.com/img", | |||
| "newUrl": "https://ctest.malls.iformall.com/img", | |||
| "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | |||
| }, | |||
| { | |||
| "newUrl": "https://c.malls.iformall.com/img1", | |||
| "newUrl": "https://ctest.malls.iformall.com/img1", | |||
| "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | |||
| }, | |||
| { | |||
| "newUrl": "https://c.malls.iformall.com/img2", | |||
| "newUrl": "https://ctest.malls.iformall.com/img2", | |||
| "orgUrl": "https://wx.qlogo.cn" | |||
| } | |||
| ], | |||
| "configUrl": "https://c.malls.iformall.com/C/api", | |||
| "ifStoreApp": "0", | |||
| "configUrl": "https://ctest.malls.iformall.com/C/api", | |||
| "businessSwitch": "1", | |||
| "businessVersion": "1", | |||
| "ifHaveWebSocket": "0", | |||
| "ifHaveCarModular": "0" | |||
| "ifHaveCarModular": "1" | |||
| }, | |||
| "name": "泊悦茂邻荟", | |||
| "weappId": "wx34aa0a9a9a55b810", | |||
| "appVersion": "C.5.1.1" | |||
| "name": "金泸商务", | |||
| "weappId": "wx649b3be73c1afe47", | |||
| "appVersion": "C.test.5.2.0" | |||
| }, | |||
| "debug": false, | |||
| "tabBar": { | |||
| @@ -77,7 +66,8 @@ | |||
| "selectedIconPath": "assets/images/user-a.png" | |||
| } | |||
| ], | |||
| "custom": true | |||
| "color": "#abb1be", | |||
| "selectedColor": "#b2743d" | |||
| }, | |||
| "window": { | |||
| "backgroundTextStyle": "dark", | |||
| @@ -87,15 +77,15 @@ | |||
| }, | |||
| "plugins": { | |||
| "auto-points-plugin": { | |||
| "version": "2.4.0", | |||
| "version": "1.3.0", | |||
| "provider": "wxfab2bf944bfc4da6" | |||
| }, | |||
| "live-player-plugin": { | |||
| "version": "1.2.5", | |||
| "version": "1.3.4", | |||
| "provider": "wx2b03c6e691cd7370" | |||
| } | |||
| }, | |||
| "extAppid": "wx34aa0a9a9a55b810", | |||
| "extAppid": "wx649b3be73c1afe47", | |||
| "extEnable": true, | |||
| "permission": { | |||
| "scope.userLocation": { | |||
| @@ -45,21 +45,21 @@ | |||
| <!-- 频道 --> | |||
| <view class="channelBox" wx:if="{{ifStoreApp!=1&&moduleList.length>0}}" style="{{typeLsit.sy_mbg.styleClass}}"> | |||
| <view class='kjBox' bindtap='goPage' data-obj="{{item}}" wx:for="{{moduleList}}" wx:key="index"> | |||
| <image src='{{item.icon}}' mode='aspectFill'></image> | |||
| <image class="img" src='{{item.icon}}' mode='aspectFill'></image> | |||
| <view class="text">{{item.name}}</view> | |||
| </view> | |||
| </view> | |||
| <view class='channelBox' wx:if="{{ifStoreApp==1}}" style="width:525rpx;"> | |||
| <view class='kjBox' bindtap='gotoBargain'> | |||
| <image src='{{kanjia}}' mode='aspectFill'></image> | |||
| <image class="img" src='{{kanjia}}' mode='aspectFill'></image> | |||
| <text>砍价</text> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoSpellGroup'> | |||
| <image src='{{pintuan}}' mode='aspectFill'></image> | |||
| <image class="img" src='{{pintuan}}' mode='aspectFill'></image> | |||
| <text>拼团</text> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoRushBuy'> | |||
| <image src='{{xiaofeika}}' mode='aspectFill'></image> | |||
| <image class="img" src='{{xiaofeika}}' mode='aspectFill'></image> | |||
| <text>限时抢购</text> | |||
| </view> | |||
| </view> | |||
| @@ -3,11 +3,13 @@ | |||
| page { | |||
| background: #f4f5f9; | |||
| } | |||
| .temp{ | |||
| .temp { | |||
| width: 100rpx; | |||
| height: 100rpx; | |||
| background-color: darkcyan | |||
| } | |||
| .xia { | |||
| width: 24rpx; | |||
| height: 14rpx; | |||
| @@ -18,7 +20,7 @@ page { | |||
| left: 0; | |||
| right: 0; | |||
| bottom: 0; | |||
| /* margin: auto; */ | |||
| } | |||
| @@ -26,21 +28,22 @@ page { | |||
| display: flex; | |||
| justify-content: space-around; | |||
| } | |||
| .goSqunar1 { | |||
| display: flex; | |||
| justify-content: center; | |||
| } | |||
| .title { | |||
| font-size: 32rpx; | |||
| font-family: OPPOSans; | |||
| font-weight: bold; | |||
| } | |||
| .title1 { | |||
| max-width:320rpx; | |||
| max-width: 320rpx; | |||
| font-size: 32rpx; | |||
| font-family: OPPOSans; | |||
| font-weight: bold; | |||
| @@ -53,9 +56,10 @@ page { | |||
| width: 24rpx; | |||
| /* height: 15rpx; */ | |||
| } | |||
| .marketName{ | |||
| } | |||
| /* .marketName{ | |||
| } */ | |||
| .f { | |||
| float: left; | |||
| } | |||
| @@ -95,7 +99,8 @@ page { | |||
| } | |||
| .color_box { | |||
| /* padding-top: 20rpx; *//* background-image: linear-gradient(#DC143C, #F4F5F9); */ | |||
| /* padding-top: 20rpx; */ | |||
| /* background-image: linear-gradient(#DC143C, #F4F5F9); */ | |||
| background-color: #f4f5f9; | |||
| } | |||
| @@ -209,18 +214,20 @@ page { | |||
| padding: 0 38rpx; | |||
| } | |||
| .section >view, .sellsection>view { | |||
| .section>view, | |||
| .sellsection>view { | |||
| width: 25%; | |||
| display: inline-block; | |||
| position: relative; | |||
| } | |||
| .section >view image, .sellsection>view image { | |||
| .section>view image, | |||
| .sellsection>view image { | |||
| display: block; | |||
| margin: 0 auto; | |||
| } | |||
| .section >view image { | |||
| .section>view image { | |||
| width: 55rpx; | |||
| height: 55rpx; | |||
| margin-top: 20rpx; | |||
| @@ -335,12 +342,12 @@ page { | |||
| width: 80rpx; | |||
| height: 80rpx; | |||
| border-radius: 50%; | |||
| overflow: hidden; | |||
| overflow: hidden; | |||
| float: left; | |||
| margin: 10rpx 10rpx; | |||
| } | |||
| .user-avatar image{ | |||
| .user-avatar image { | |||
| display: block; | |||
| width: 100%; | |||
| height: 100%; | |||
| @@ -628,13 +635,13 @@ progress { | |||
| text-align: center; | |||
| } | |||
| .kjBox image { | |||
| .kjBox .img { | |||
| width: 60rpx; | |||
| height: 60rpx; | |||
| margin: auto; | |||
| } | |||
| .kjBox1 image { | |||
| .kjBox1 .img { | |||
| width: 80rpx; | |||
| height: 80rpx; | |||
| margin: auto; | |||
| @@ -823,4 +830,4 @@ i-tabs i-tabs-scroll { | |||
| right: 20rpx; | |||
| position: fixed; | |||
| z-index: 1000000; | |||
| } | |||
| } | |||
| @@ -16,7 +16,7 @@ | |||
| "autoAudits": false, | |||
| "showShadowRootInWxmlPanel": true, | |||
| "scopeDataCheck": false, | |||
| "uglifyFileName": false, | |||
| "uglifyFileName": true, | |||
| "checkInvalidKey": true, | |||
| "checkSiteMap": true, | |||
| "uploadWithSourceMap": true, | |||
| @@ -29,11 +29,12 @@ | |||
| "useMultiFrameRuntime": true, | |||
| "useApiHook": true, | |||
| "useApiHostProcess": true, | |||
| "useIsolateContext": true | |||
| "useIsolateContext": true, | |||
| "ignoreUploadUnusedFiles": true | |||
| }, | |||
| "compileType": "miniprogram", | |||
| "libVersion": "2.11.2", | |||
| "appid": "wx453ae0d37f3550d0", | |||
| "appid": "wxfa336cad86ed598d", | |||
| "projectname": "C", | |||
| "simulatorType": "wechat", | |||
| "simulatorPluginLibVersion": {}, | |||