Selaa lähdekoodia

FirstUpload

packages
HolyKnightIX 2 vuotta sitten
vanhempi
commit
97809a71e5
27 muutettua tiedostoa jossa 270 lisäystä ja 203 poistoa
  1. +4
    -4
      components/commodityMould/commodityMould.wxml
  2. +5
    -4
      components/commodityMould/commodityMould.wxss
  3. +7
    -7
      components/coupons/index.wxml
  4. +11
    -9
      components/coupons/index.wxss
  5. +1
    -1
      components/discountCard/index.wxml
  6. +1
    -1
      components/discountCard/index.wxss
  7. +6
    -6
      components/hot/index.wxml
  8. +5
    -5
      components/hot/index.wxss
  9. +2
    -2
      components/navbar/navbar.wxml
  10. +3
    -3
      components/navbar/navbar.wxss
  11. +1
    -1
      components/optimization/optimization.wxml
  12. +2
    -1
      components/optimization/optimization.wxss
  13. +2
    -2
      custom-tab-bar/index.wxml
  14. +2
    -2
      custom-tab-bar/index.wxss
  15. +73
    -21
      ext.json
  16. +1
    -1
      pages/fillIndent/fillIndent.json
  17. +6
    -4
      pages/main/coupons/index.wxml
  18. +21
    -13
      pages/main/coupons/index.wxss
  19. +1
    -1
      pages/questionnaire/questionnaireLsit/questionnaireLsit.json
  20. +1
    -1
      pages/site/site.json
  21. +1
    -1
      pages/siteAdd/siteAdd.json
  22. +1
    -1
      pages/siteUser/siteUser.json
  23. +5
    -5
      pages/siteUser/siteUser.wxml
  24. +9
    -9
      pages/theme/index1/index.json
  25. +93
    -93
      project.config.json
  26. +2
    -1
      project.private.config.json
  27. +4
    -4
      utils/util.js

+ 4
- 4
components/commodityMould/commodityMould.wxml Näytä tiedosto

@@ -4,7 +4,7 @@


<view wx:if="{{obj.couponList.length>0||obj.isOnlyAd==1}}"> <view wx:if="{{obj.couponList.length>0||obj.isOnlyAd==1}}">
<view class='product' bindtap='gotoTopic' data-id="{{obj.id}}" wx:if="{{obj.isOnlyAd==1}}"> <view class='product' bindtap='gotoTopic' data-id="{{obj.id}}" wx:if="{{obj.isOnlyAd==1}}">
<image src='{{obj.cover}}' mode='scaleToFill'></image>
<image class="img" src='{{obj.cover}}' mode='scaleToFill'></image>
</view> </view>




@@ -19,12 +19,12 @@


<view class="contBox"> <view class="contBox">
<view class="topImg" wx:if="{{obj.cover}}" bindtap="lookAll"> <view class="topImg" wx:if="{{obj.cover}}" bindtap="lookAll">
<image src="{{obj.cover}}" mode='scaleToFill'></image>
<image class="img" src="{{obj.cover}}" mode='scaleToFill'></image>
</view> </view>
<div class="itemBox" wx:if="{{obj.couponList&&obj.couponList.length>0}}"> <div class="itemBox" wx:if="{{obj.couponList&&obj.couponList.length>0}}">
<view class="item" wx:for="{{obj.couponList}}" wx:key="index" bindtap="goDetail" data-type="{{item.type}}" data-id="{{item.id}}" data-couponid="{{item.couponId}}"> <view class="item" wx:for="{{obj.couponList}}" wx:key="index" bindtap="goDetail" data-type="{{item.type}}" data-id="{{item.id}}" data-couponid="{{item.couponId}}">
<view class="itemImg"> <view class="itemImg">
<image src="{{item.coverImg}}" mode='scaleToFill'></image>
<image class="img" src="{{item.coverImg}}" mode='scaleToFill'></image>
<view class="sellout" wx:if="{{item.remainInventory==0}}"> <view class="sellout" wx:if="{{item.remainInventory==0}}">
<image class="selloutImg" src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_img_ysx.png"></image> <image class="selloutImg" src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_img_ysx.png"></image>
</view> </view>
@@ -54,7 +54,7 @@
</view> </view>
<view class="item moreItem" bindtap="lookAll"> <view class="item moreItem" bindtap="lookAll">
<view class="noDataImg"> <view class="noDataImg">
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_img_zwlp.png"></image>
<image class="img" src="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_img_zwlp.png"></image>
</view> </view>
<view class="noDataText">查看更多优惠活动</view> <view class="noDataText">查看更多优惠活动</view>
</view> </view>


+ 5
- 4
components/commodityMould/commodityMould.wxss Näytä tiedosto

@@ -61,7 +61,7 @@
/* background-color: chartreuse; */ /* background-color: chartreuse; */
} }


.topImg image {
.topImg .img {
border-radius: 16rpx; border-radius: 16rpx;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -94,7 +94,7 @@
/* background-color: aquamarine; */ /* background-color: aquamarine; */
} }


.itemImg image {
.itemImg .img {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 16rpx; border-radius: 16rpx;
@@ -207,6 +207,7 @@
color: #999; color: #999;
background: linear-gradient(180deg, #dcb07d 0%, #f5e0bf 100%); background: linear-gradient(180deg, #dcb07d 0%, #f5e0bf 100%);
-webkit-background-clip: text; -webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
margin-left: 8rpx; margin-left: 8rpx;
} }
@@ -230,7 +231,7 @@
margin: 25% auto 5% auto; margin: 25% auto 5% auto;
} }


.noDataImg image {
.noDataImg .img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@@ -251,7 +252,7 @@
overflow: hidden; overflow: hidden;
} }


.product image {
.product .img {
height: 100%; height: 100%;
display: block; display: block;
width: 100%; width: 100%;


+ 7
- 7
components/coupons/index.wxml Näytä tiedosto

@@ -15,7 +15,7 @@
<view class="desc" wx:if="{{data.targetAd == 5}}">消费卡</view> <view class="desc" wx:if="{{data.targetAd == 5}}">消费卡</view>
</view> </view>
<view class="coupons-img"> <view class="coupons-img">
<image src="{{data.coverImg}}" style="{{mouldConfig.imgHomeH}}" mode='aspectFill' lazy-load="true"></image>
<image class="img" src="{{data.coverImg}}" style="{{mouldConfig.imgHomeH}}" mode='aspectFill' lazy-load="true"></image>
</view> </view>
<view class="coupons-info"> <view class="coupons-info">
<view class="coupons-info-name tit">{{data.title}}</view> <view class="coupons-info-name tit">{{data.title}}</view>
@@ -23,14 +23,14 @@
<view class="coupons-info-price-p"> <view class="coupons-info-price-p">
<view class='price' wx:if="{{data.type!=10}}"> <view class='price' wx:if="{{data.type!=10}}">
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text> <text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text>
<text class='num'>{{data.salePriceStr}}</text>
<text wx:if="{{!(data.type==5&&data.unit==1)}}" class='view02'>¥{{data.priceStr}}</text></text>
<text class='num'>{{data.salePriceStr}}</text>
<text wx:if="{{!(data.type==5&&data.unit==1)}}" class='view02'>¥{{data.priceStr}}</text></text>
<text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text> <text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text> <text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text> <text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>
<text class='rmb'>¥</text>{{data.salePriceStr}}</text>


<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> <view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}">
<!-- <view class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</view> --> <!-- <view class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</view> -->
@@ -38,7 +38,7 @@
</view> </view>
<view class="coupons-info-manjian" wx:elif="{{data.type == 3||data.type==4||data.type==5}}"> <view class="coupons-info-manjian" wx:elif="{{data.type == 3||data.type==4||data.type==5}}">
<!-- <text class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</text> --> <!-- <text class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</text> -->
<text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text>
<text class="text" wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text>
</view> </view>
</view> </view>
<view class="earnest" wx:if="{{data.type==10}}"> <view class="earnest" wx:if="{{data.type==10}}">


+ 11
- 9
components/coupons/index.wxss Näytä tiedosto

@@ -7,11 +7,13 @@
overflow: hidden; overflow: hidden;
border-radius: 12rpx; border-radius: 12rpx;
} }
.earnest{

.earnest {
color: red; color: red;
font-size: 24rpx; font-size: 24rpx;
padding-left: 10rpx; padding-left: 10rpx;
} }

.coupons-border { .coupons-border {
height: 1rpx; height: 1rpx;
left: 30rpx; left: 30rpx;
@@ -21,7 +23,7 @@
bottom: 0; bottom: 0;
} }


.coupons-img image {
.coupons-img .img {
display: block; display: block;
width: 300rpx; width: 300rpx;
height: 176rpx; height: 176rpx;
@@ -78,7 +80,7 @@
.rmb { .rmb {
font-size: 24rpx !important; font-size: 24rpx !important;
margin-right: 4rpx !important; margin-right: 4rpx !important;
color: #FD782D!;
color: #FD782D !;
} }


.num { .num {
@@ -192,12 +194,12 @@
margin-top: 16rpx; margin-top: 16rpx;
} }


.coupons-info-manjian text {
.coupons-info-manjian .text {
display: block; display: block;
line-height: 20rpx; line-height: 20rpx;
} }


.coupons-info-manjian > text:nth-of-type(1) {
.coupons-info-manjian>.text:nth-of-type(1) {
display: block; display: block;
/* color: #FF4949; */ /* color: #FF4949; */
opacity: 0.6; opacity: 0.6;
@@ -315,9 +317,9 @@ scroll-view {
font-size: 26rpx; font-size: 26rpx;
} }


.navigator:nth-of-type(2n+1) {
/* margin-right: 10rpx; */
}
/* .navigator:nth-of-type(2n+1) {
margin-right: 10rpx;
} */


.superscript { .superscript {
position: absolute; position: absolute;
@@ -369,4 +371,4 @@ scroll-view {
display: inline-block; display: inline-block;
margin-right: 10rpx; margin-right: 10rpx;
font-weight: 400; font-weight: 400;
}
}

+ 1
- 1
components/discountCard/index.wxml Näytä tiedosto

@@ -1,5 +1,5 @@
<view class='content' > <view class='content' >
<view bindtap='gotoDiscountCardList'> <view bindtap='gotoDiscountCardList'>
<image src='{{discountcardUrl}}' mode='widthFix'></image>
<image class="img" src='{{discountcardUrl}}' mode='widthFix'></image>
</view> </view>
</view> </view>

+ 1
- 1
components/discountCard/index.wxss Näytä tiedosto

@@ -1,4 +1,4 @@
.content image{
.content .img {
display: block; display: block;
margin: 30rpx auto 0; margin: 30rpx auto 0;
border: 1px solid red; border: 1px solid red;


+ 6
- 6
components/hot/index.wxml Näytä tiedosto

@@ -6,21 +6,21 @@
<text>爆款专区</text> <text>爆款专区</text>
</view> </view>
<view class='titleR' bindtap='getChange'wx:if="{{pSize>=2||kSize>=2}}" > <view class='titleR' bindtap='getChange'wx:if="{{pSize>=2||kSize>=2}}" >
<text style='color:{{txt}}'>换一换</text>
<view>
<image src='{{change}}' bindtap='' mode='aspectFill'></image>
<text class="text" style='color:{{txt}}'>换一换</text>
<view class="view">
<image class="img" src='{{change}}' bindtap='' mode='aspectFill'></image>
</view> </view>
</view> </view>
</view> </view>
<view class='hotCon clearfix'> <view class='hotCon clearfix'>
<view class='kanjia' wx:if="{{kSize}}" bindtap="gotokjdetail" data-couponId='{{kData.couponId}}' data-couponChannelId="{{kData.id}}" data-targetAd="{{kData.targetAd}}" > <view class='kanjia' wx:if="{{kSize}}" bindtap="gotokjdetail" data-couponId='{{kData.couponId}}' data-couponChannelId="{{kData.id}}" data-targetAd="{{kData.targetAd}}" >
<view > <view >
<image mode='aspectFill' lazy-load='true' src="{{kData.coverImg}}" />
<image class="img" mode='aspectFill' lazy-load='true' src="{{kData.coverImg}}" />
</view> </view>
<view class='kjText'> <view class='kjText'>
<text class='title'>{{kData.title}}</text> <text class='title'>{{kData.title}}</text>
<text class='price'>¥{{kData.priceStr}}</text> <text class='price'>¥{{kData.priceStr}}</text>
<text class='sale'><text>¥</text>{{kData.salePriceStr}}</text>
<text class='sale'><text class="price">¥</text>{{kData.salePriceStr}}</text>
<view class=' btn btnk'>砍价</view> <view class=' btn btnk'>砍价</view>
</view> </view>
</view> </view>
@@ -42,7 +42,7 @@
<view class='ptText'> <view class='ptText'>
<text class='title'>{{pData.title}}</text> <text class='title'>{{pData.title}}</text>
<text class='price'>¥{{pData.priceStr}}</text> <text class='price'>¥{{pData.priceStr}}</text>
<text class='sale'> <text>¥</text>{{pData.salePriceStr}}</text>
<text class='sale' class="price"> <text>¥</text>{{pData.salePriceStr}}</text>
<view class='btn btnp' >拼团</view> <view class='btn btnp' >拼团</view>
</view> </view>
</view> </view>


+ 5
- 5
components/hot/index.wxss Näytä tiedosto

@@ -16,18 +16,18 @@
.titleL .titleR{ .titleL .titleR{
width: 100rpx; width: 100rpx;
} }
.titleR text{
.titleR .text{
float: left; float: left;
margin-right: 10rpx; margin-right: 10rpx;
font-family:PingFangSC-Regular!important; font-family:PingFangSC-Regular!important;
} }
.titleR view{
.titleR .view{
height: 40rpx; height: 40rpx;
width: 40rpx; width: 40rpx;
/* margin-top: 10rpx; */ /* margin-top: 10rpx; */
float: left; float: left;
} }
.titleR image{
.titleR .img{
height: 28rpx; height: 28rpx;
width: 28rpx; width: 28rpx;
} }
@@ -57,7 +57,7 @@
.pintuan{ .pintuan{
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
} }
.hotCon image{
.hotCon .img{
width: 86rpx; width: 86rpx;
height: 86rpx; height: 86rpx;
margin: 24rpx 0 46rpx 16rpx; margin: 24rpx 0 46rpx 16rpx;
@@ -128,6 +128,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.sale text{
.sale .price{
font-size: 20rpx!important; font-size: 20rpx!important;
} }

+ 2
- 2
components/navbar/navbar.wxml Näytä tiedosto

@@ -2,8 +2,8 @@
<view style="{{'height: ' + statusBarHeight}}"></view> <view style="{{'height: ' + statusBarHeight}}"></view>
<view class='title-container'> <view class='title-container'>
<view class='capsule' wx:if="{{ back || home}}"> <view class='capsule' wx:if="{{ back || home}}">
<view bindtap='back' wx:if="{{back}}">
<image style="left:36%;" src='img/back.svg'></image>
<view class="view" bindtap='back' wx:if="{{back}}">
<image class="img" style="left:36%;" src='img/back.svg'></image>
</view> </view>
<view bindtap='backHome' wx:if="{{home}}"> <view bindtap='backHome' wx:if="{{home}}">
<image src='img/home.svg' style="width:90%;"></image> <image src='img/home.svg' style="width:90%;"></image>


+ 3
- 3
components/navbar/navbar.wxss Näytä tiedosto

@@ -27,17 +27,17 @@
background: #fff!important; background: #fff!important;
} }


.capsule > view {
.capsule > .view {
width: 35px; width: 35px;
height: 60%; height: 60%;
position: relative; position: relative;
} }


.capsule > view:nth-child(2) {
.capsule > .view:nth-child(2) {
border-left: 1px solid #777; border-left: 1px solid #777;
} }


.capsule image {
.capsule .img {
width: 70%; width: 70%;
height: 100%; height: 100%;
position: absolute; position: absolute;


+ 1
- 1
components/optimization/optimization.wxml Näytä tiedosto

@@ -16,7 +16,7 @@
<view class="contLsitBox"> <view class="contLsitBox">
<view class="item" wx:for="{{businessData}}" wx:key="{{index}}" bindtap="goDetail" data-couponid="{{item.couponId}}" data-id="{{item.id}}"> <view class="item" wx:for="{{businessData}}" wx:key="{{index}}" bindtap="goDetail" data-couponid="{{item.couponId}}" data-id="{{item.id}}">
<view class="itemImg"> <view class="itemImg">
<image src="{{item.coverImg}}" mode='scaleToFill'></image>
<image class="img" src="{{item.coverImg}}" mode='scaleToFill'></image>
</view> </view>
<view class="titleName">{{item.title}}</view> <view class="titleName">{{item.title}}</view>
<view class="priceBox"> <view class="priceBox">


+ 2
- 1
components/optimization/optimization.wxss Näytä tiedosto

@@ -74,6 +74,7 @@
text-align: center; text-align: center;
background: linear-gradient(180deg, #cc9a60 0%, #dfbf8e 100%); background: linear-gradient(180deg, #cc9a60 0%, #dfbf8e 100%);
-webkit-background-clip: text; -webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
margin: 20rpx auto 10rpx auto; margin: 20rpx auto 10rpx auto;
} }
@@ -112,7 +113,7 @@
border-radius: 20rpx; border-radius: 20rpx;
/* background-color: aquamarine; */ /* background-color: aquamarine; */
} }
.itemImg image{
.itemImg .img{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx 20rpx 0 0; border-radius: 20rpx 20rpx 0 0;


+ 2
- 2
custom-tab-bar/index.wxml Näytä tiedosto

@@ -2,7 +2,7 @@
<view class="tab-bar" wx:if="{{list.length!=0}}"> <view class="tab-bar" wx:if="{{list.length!=0}}">
<view class="tab-bar-border"></view> <view class="tab-bar-border"></view>
<view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab"> <view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
<image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
<view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
<image class="img" src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
<view class="view" style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
</view> </view>
</view> </view>

+ 2
- 2
custom-tab-bar/index.wxss Näytä tiedosto

@@ -30,11 +30,11 @@
flex-direction: column; flex-direction: column;
} }


.tab-bar-item image {
.tab-bar-item .img {
width: 46rpx; width: 46rpx;
height: 46rpx; height: 46rpx;
} }


.tab-bar-item view {
.tab-bar-item .view {
font-size: 20rpx; font-size: 20rpx;
} }

+ 73
- 21
ext.json Näytä tiedosto

@@ -1,43 +1,91 @@
{ {
"ext": { "ext": {
"attr": { "attr": {
"configUrl": "https://btest.malls.iformall.com",
"datatowerurl": "https://mobiletest.malls.iformall.com"
"car": {
"etcp": {
"etcpAppId": "wx192b7d2e8dcbefd0",
"etcpVersion": "release",
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
}
},
"mchId": "1604439800",
"imgProxy": [
{
"newUrl": "https://ctest.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
"newUrl": "https://ctest.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
"newUrl": "https://ctest.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
"configUrl": "https://ctest.malls.iformall.com/C/api",
"businessSwitch": "1",
"ifHaveWebSocket": "0",
"ifHaveCarModular": "1"
}, },
"name": "金泸商务商家版",
"weappId": "wx9ff823abeef23b94",
"appVersion": "Btest.5.1.0"
"name": "金泸商务",
"weappId": "wx649b3be73c1afe47",
"appVersion": "C.test.5.2.0"
}, },
"debug": false, "debug": false,
"tabBar": { "tabBar": {
"list": [ "list": [
{ {
"text": "首页", "text": "首页",
"iconPath": "static/images/home-n.png",
"pagePath": "pages/main/main",
"selectedIconPath": "static/images/home-y.png"
"iconPath": "assets/images/home.png",
"pagePath": "index/index",
"selectedIconPath": "assets/images/home-a.png"
},
{
"text": "首页",
"iconPath": "assets/images/home.png",
"pagePath": "pages/theme/index1/index",
"selectedIconPath": "assets/images/home-a.png"
},
{
"text": "门店",
"iconPath": "assets/images/mendian.png",
"pagePath": "index/searchbar",
"selectedIconPath": "assets/images/mendian-a.png"
}, },
{ {
"text": "账单",
"iconPath": "static/images/bill.png",
"pagePath": "pages/bill/bill",
"selectedIconPath": "static/images/bill1.png"
"text": "停车",
"iconPath": "assets/images/park.png",
"pagePath": "index/passCar",
"selectedIconPath": "assets/images/park-a.png"
}, },
{ {
"text": "我的", "text": "我的",
"iconPath": "static/images/user-n.png",
"pagePath": "pages/mine/mine",
"selectedIconPath": "static/images/user-y.png"
"iconPath": "assets/images/user.png",
"pagePath": "index/user",
"selectedIconPath": "assets/images/user-a.png"
} }
], ],
"color": "#9F9F9F",
"selectedColor": "#52a0fd"
"color": "#abb1be",
"selectedColor": "#b2743d"
}, },
"window": { "window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#52A0FD"
"backgroundTextStyle": "dark",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#FFFFFF"
}, },
"extAppid": "wx9ff823abeef23b94",
"plugins": {
"auto-points-plugin": {
"version": "1.3.0",
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
"version": "1.3.4",
"provider": "wx2b03c6e691cd7370"
}
},
"extAppid": "wx649b3be73c1afe47",
"extEnable": true, "extEnable": true,
"permission": { "permission": {
"scope.userLocation": { "scope.userLocation": {
@@ -48,5 +96,9 @@
"networkTimeout": { "networkTimeout": {
"request": 30000, "request": 30000,
"downloadFile": 10000 "downloadFile": 10000
}
},
"requiredPrivateInfos": [
"chooseLocation",
"getLocation"
]
} }

+ 1
- 1
pages/fillIndent/fillIndent.json Näytä tiedosto

@@ -1,5 +1,5 @@
{ {
"usingComponents": { "usingComponents": {
"navbar": "../components/navbar/navbar"
"navbar": "/components/navbar/navbar"
} }
} }

+ 6
- 4
pages/main/coupons/index.wxml Näytä tiedosto

@@ -6,10 +6,12 @@
<c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" /> <c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" />
</view> </view>
<view class='dingdan' wx:if="{{list.length==0}}"> <view class='dingdan' wx:if="{{list.length==0}}">
<image src="{{actUrl}}" mode="widthFix"></image>
<text>请您敬请期待</text>
<text>我们正在筹备一大波优惠活动</text>
<image class="img" src="{{actUrl}}" mode="widthFix"></image>
<text class="tetx">请您敬请期待</text>
<text class="tetx">我们正在筹备一大波优惠活动</text>
</view>
<view class="loading" wx:if="{{loading}}">
<image class="img" src="{{loadingUrl}}" mode="widthFix"></image>{{content}}
</view> </view>
<view class="loading" wx:if="{{loading}}"><image src="{{loadingUrl}}" mode="widthFix"></image>{{content}}</view>
<view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view>
</view> </view>

+ 21
- 13
pages/main/coupons/index.wxss Näytä tiedosto

@@ -1,12 +1,15 @@
@import "../../../app.wxss"; @import "../../../app.wxss";

.index-coupons { .index-coupons {
padding: 0 20rpx; padding: 0 20rpx;
/* margin-top: 40rpx; */ /* margin-top: 40rpx; */
/* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */
} }
i-tabs i-tabs-scroll {
background: #F4F5F9!important;
}

i-tabs i-tabs-scroll {
background: #F4F5F9 !important;
}

.loading { .loading {
text-align: center; text-align: center;
height: 80rpx; height: 80rpx;
@@ -14,17 +17,21 @@
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
} }
.coupons c-coupons{

.coupons c-coupons {
height: 354rpx; height: 354rpx;
margin-bottom: 34rpx; margin-bottom: 34rpx;
} }
.coupons c-coupons:nth-of-type(2n+1){

.coupons c-coupons:nth-of-type(2n+1) {
float: left; float: left;
} }
.coupons c-coupons:nth-of-type(2n){

.coupons c-coupons:nth-of-type(2n) {
float: right; float: right;
} }
.loading image {

.loading .img {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
vertical-align: middle; vertical-align: middle;
@@ -35,7 +42,7 @@
margin-top: 33rpx; margin-top: 33rpx;
} */ } */


.dingdan text:nth-of-type(1) {
.dingdan .text:nth-of-type(1) {
display: block; display: block;
font-size: 34rpx; font-size: 34rpx;
color: #333; color: #333;
@@ -43,7 +50,7 @@
text-align: center; text-align: center;
} }


.dingdan text:nth-of-type(2) {
.dingdan .text:nth-of-type(2) {
display: block; display: block;
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
@@ -51,15 +58,16 @@
text-align: center; text-align: center;
} }


.dingdan image {
.dingdan .img {
display: block; display: block;
width: 300rpx; width: 300rpx;
height: 300rpx; height: 300rpx;
margin: 0 auto 16rpx; margin: 0 auto 16rpx;
} }
.loadingtext{

.loadingtext {
text-align: center; text-align: center;
color: #888; color: #888;
font-size: 30rpx; font-size: 30rpx;
margin-top:30rpx;
}
margin-top: 30rpx;
}

+ 1
- 1
pages/questionnaire/questionnaireLsit/questionnaireLsit.json Näytä tiedosto

@@ -1,6 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"navbar": "../../components/navbar/navbar"
"navbar": "/components/navbar/navbar"
}, },
"navigationBarBackgroundColor": "#FD832D", "navigationBarBackgroundColor": "#FD832D",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"

+ 1
- 1
pages/site/site.json Näytä tiedosto

@@ -1,5 +1,5 @@
{ {
"usingComponents": { "usingComponents": {
"navbar": "../components/navbar/navbar"
"navbar": "/components/navbar/navbar"
} }
} }

+ 1
- 1
pages/siteAdd/siteAdd.json Näytä tiedosto

@@ -1,5 +1,5 @@
{ {
"usingComponents": { "usingComponents": {
"navbar": "../components/navbar/navbar"
"navbar": "/components/navbar/navbar"
} }
} }

+ 1
- 1
pages/siteUser/siteUser.json Näytä tiedosto

@@ -1,5 +1,5 @@
{ {
"usingComponents": { "usingComponents": {
"navbar": "../components/navbar/navbar"
"navbar": "/components/navbar/navbar"
} }
} }

+ 5
- 5
pages/siteUser/siteUser.wxml Näytä tiedosto

@@ -2,16 +2,16 @@
<view style="height:{{navigationBarHeight}} "></view> <view style="height:{{navigationBarHeight}} "></view>
<view class="siteItem" wx:for="{{list}}" wx:key="{{index}}"> <view class="siteItem" wx:for="{{list}}" wx:key="{{index}}">
<view class="siteBox"> <view class="siteBox">
<view class="titleBox"> <view class="titleBox">
<view class="moTxet" wx:if="{{item.isDefault==1}}">默认</view> <view class="moTxet" wx:if="{{item.isDefault==1}}">默认</view>
<view class="{{index==0?'regionT':'region'}}">{{item.consignee}} {{item.mobile}}</view>
<view class="{{index==0?'regionT':'region'}}">{{item.consignee}} {{item.mobile}}</view>
</view> </view>
<view class="region phone">{{item.regionSty}} </view> <view class="region phone">{{item.regionSty}} </view>
<view class="region detail">{{item.address}}</view> <view class="region detail">{{item.address}}</view>
</view> </view>
<image mode="aspectFit" bindtap="dutu" data-id="{{item.id}}" class="updataImg" src="https://formall.oss-accelerate.aliyuncs.com/cimg/siteUpdata.png"></image>
<image mode="aspectFit" bindtap="dutu" data-id="{{item.id}}" class="updataImg" src="https://formall.oss-accelerate.aliyuncs.com/cimg/siteUpdata.png"></image>
</view> </view>
<view class="addSite" bindtap="goAdd">+新建收货地址</view> <view class="addSite" bindtap="goAdd">+新建收货地址</view>

+ 9
- 9
pages/theme/index1/index.json Näytä tiedosto

@@ -1,14 +1,14 @@
{ {
"usingComponents": { "usingComponents": {
"c-banner": "../components/banner/index",
"discount-card": "../components/discountCard/index",
"c-coupons": "../pages/main/coupons/index",
"g-entry": "../components/gameentry/gentry",
"c-hot": "../components/hot/index",
"c-advertisement": "../components/advertisement/advertisement",
"navbar": "../components/navbar/navbar",
"c-mould": "../components/commodityMould/commodityMould",
"optimization": "../components/optimization/optimization"
"c-banner": "/components/banner/index",
"discount-card": "/components/discountCard/index",
"c-coupons": "/pages/main/coupons/index",
"g-entry": "/components/gameentry/gentry",
"c-hot": "/components/hot/index",
"c-advertisement": "/components/advertisement/advertisement",
"navbar": "/components/navbar/navbar",
"c-mould": "/components/commodityMould/commodityMould",
"optimization": "/components/optimization/optimization"
}, },
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F5F9" "navigationBarBackgroundColor": "#F4F5F9"

+ 93
- 93
project.config.json Näytä tiedosto

@@ -1,95 +1,95 @@
{ {
"description": "项目配置文件",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": false,
"postcss": true,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"minifyWXML": true,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"useIsolateContext": true
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
"appid": "wx453ae0d37f3550d0",
"projectname": "oldC",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
},
"condition": {
"miniprogram": {
"list": [
{
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "orderId=653810672414679040&from=discount&composeOrderType=0",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"pathName": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"query": "",
"scene": null
},
{
"name": "index/index",
"pathName": "index/index",
"query": "",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/main/index",
"pathName": "pages/main/index",
"query": "type=cd&couponChannelId=684973014355992576",
"scene": null
},
{
"name": "pages/siteUser/siteUser",
"pathName": "pages/siteUser/siteUser",
"query": "",
"scene": null
},
{
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/freeBannerDetail/index",
"pathName": "pages/freeBannerDetail/index",
"query": "id= 690072721969307648",
"scene": null
}
]
}
}
"description": "项目配置文件",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"urlCheck": true,
"es6": true,
"enhance": false,
"postcss": true,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"minifyWXML": true,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"useIsolateContext": true
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
"appid": "wxfa116c4a29453fc9",
"projectname": "oldC",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
},
"condition": {
"miniprogram": {
"list": [
{
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "orderId=653810672414679040&from=discount&composeOrderType=0",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"pathName": "pages/questionnaire/questionnaireLsit/questionnaireLsit",
"query": "",
"scene": null
},
{
"name": "index/index",
"pathName": "index/index",
"query": "",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/main/index",
"pathName": "pages/main/index",
"query": "type=cd&couponChannelId=684973014355992576",
"scene": null
},
{
"name": "pages/siteUser/siteUser",
"pathName": "pages/siteUser/siteUser",
"query": "",
"scene": null
},
{
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "",
"scene": 1036,
"referrerInfo": {}
},
{
"name": "pages/freeBannerDetail/index",
"pathName": "pages/freeBannerDetail/index",
"query": "id= 690072721969307648",
"scene": null
}
]
}
}
} }

+ 2
- 1
project.private.config.json Näytä tiedosto

@@ -3,5 +3,6 @@
"projectname": "C", "projectname": "C",
"setting": { "setting": {
"compileHotReLoad": true "compileHotReLoad": true
}
},
"libVersion": "2.11.2"
} }

+ 4
- 4
utils/util.js Näytä tiedosto

@@ -24,10 +24,10 @@ function convertUTCTimeToLocalTime(UTCDateString) {
return dateStr; return dateStr;
} }


function fmtDate(date) {
var dateee = new Date(date).toJSON();
return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
}
// function fmtDate(date) {
// var dateee = new Date(date).toJSON();
// return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
// }


function toHHmmss(date) {//传入时间戳获取时分秒 function toHHmmss(date) {//传入时间戳获取时分秒
var time; var time;


Ladataan…
Peruuta
Tallenna