Bläddra i källkod

[图片整理][修改]

tags/安徽版C.4.1.6最终版
meo 6 år sedan
förälder
incheckning
ddba1cb59e
68 ändrade filer med 111 tillägg och 296 borttagningar
  1. Binär
      assets/images/arrow.png
  2. Binär
      assets/images/bargaincancel.png
  3. Binär
      assets/images/bargainfail.png
  4. Binär
      assets/images/bargainsuccess.png
  5. Binär
      assets/images/bgg.png
  6. Binär
      assets/images/close.png
  7. Binär
      assets/images/discount.png
  8. Binär
      assets/images/gift.png
  9. Binär
      assets/images/give.png
  10. Binär
      assets/images/help.gif
  11. Binär
      assets/images/home.png
  12. Binär
      assets/images/icon004.gif
  13. Binär
      assets/images/icon01.png
  14. Binär
      assets/images/no.png
  15. Binär
      assets/images/pay-success.png
  16. Binär
      assets/images/share.png
  17. Binär
      assets/images/shixiao.png
  18. Binär
      assets/images/success.png
  19. Binär
      assets/images/success01.png
  20. Binär
      assets/images/yes.png
  21. +0
    -26
      dist/card/index.js
  22. +0
    -3
      dist/card/index.json
  23. +0
    -11
      dist/card/index.wxml
  24. +0
    -1
      dist/card/index.wxss
  25. +0
    -20
      dist/col/index.js
  26. +0
    -3
      dist/col/index.json
  27. +0
    -1
      dist/col/index.wxml
  28. +0
    -1
      dist/col/index.wxss
  29. +0
    -22
      dist/icon/index.js
  30. +0
    -3
      dist/icon/index.json
  31. +0
    -1
      dist/icon/index.wxml
  32. +0
    -1
      dist/icon/index.wxss
  33. +0
    -62
      dist/tab-bar-item/index.js
  34. +0
    -8
      dist/tab-bar-item/index.json
  35. +0
    -10
      dist/tab-bar-item/index.wxml
  36. +0
    -1
      dist/tab-bar-item/index.wxss
  37. +0
    -66
      dist/tab-bar/index.js
  38. +0
    -3
      dist/tab-bar/index.json
  39. +0
    -6
      dist/tab-bar/index.wxml
  40. +0
    -1
      dist/tab-bar/index.wxss
  41. +1
    -1
      ext.json
  42. +3
    -0
      pages/bargain/bargain.js
  43. +3
    -8
      pages/bargain/bargain.wxml
  44. +4
    -0
      pages/bargain/bargainDatail/bargainDatail.js
  45. +3
    -3
      pages/bargain/bargainDatail/bargainDatail.wxml
  46. +1
    -0
      pages/cardorder/index/index.js
  47. +1
    -1
      pages/cardorder/index/index.wxml
  48. +3
    -0
      pages/coupon/detail/index.js
  49. +3
    -3
      pages/coupon/detail/index.wxml
  50. +1
    -0
      pages/coupon/detail/index.wxss
  51. +1
    -0
      pages/couponorder/index/index.js
  52. +1
    -1
      pages/couponorder/index/index.wxml
  53. +1
    -0
      pages/czdetail/czdetail.js
  54. +1
    -1
      pages/czdetail/czdetail.wxml
  55. +1
    -4
      pages/main/bargain/index.json
  56. +1
    -4
      pages/main/spellGroup/index.json
  57. +2
    -0
      pages/order/index/index.js
  58. +3
    -3
      pages/order/index/index.wxml
  59. +3
    -1
      pages/paySuccess/paySuccess.js
  60. +1
    -1
      pages/paySuccess/paySuccess.wxml
  61. +1
    -0
      pages/rushToBuy/index.js
  62. +1
    -1
      pages/rushToBuy/index.wxml
  63. +4
    -1
      pages/scanPay/scanPay.js
  64. +2
    -2
      pages/scanPay/scanPay.wxml
  65. +1
    -1
      pages/spellGroup/mySpellGroup/index.wxml
  66. +1
    -9
      pages/spellGroup/mySpellGroup/index.wxss
  67. +1
    -1
      project.config.json
  68. +62
    -0
      utils/imgurl.js

Binär
assets/images/arrow.png Visa fil

Före Efter
Bredd: 46  |  Höjd: 24  |  Storlek: 366 B

Binär
assets/images/bargaincancel.png Visa fil

Före Efter
Bredd: 140  |  Höjd: 116  |  Storlek: 22 KiB

Binär
assets/images/bargainfail.png Visa fil

Före Efter
Bredd: 280  |  Höjd: 232  |  Storlek: 33 KiB

Binär
assets/images/bargainsuccess.png Visa fil

Före Efter
Bredd: 280  |  Höjd: 232  |  Storlek: 33 KiB

Binär
assets/images/bgg.png Visa fil

Före Efter
Bredd: 1500  |  Höjd: 110  |  Storlek: 13 KiB

Binär
assets/images/close.png Visa fil

Före Efter
Bredd: 200  |  Höjd: 200  |  Storlek: 3.3 KiB

Binär
assets/images/discount.png Visa fil

Före Efter
Bredd: 142  |  Höjd: 142  |  Storlek: 27 KiB

Binär
assets/images/gift.png Visa fil

Före Efter
Bredd: 504  |  Höjd: 346  |  Storlek: 21 KiB

Binär
assets/images/give.png Visa fil

Före Efter
Bredd: 142  |  Höjd: 142  |  Storlek: 28 KiB

Binär
assets/images/help.gif Visa fil

Före Efter
Bredd: 210  |  Höjd: 210  |  Storlek: 31 KiB

Binär
assets/images/home.png Visa fil

Före Efter
Bredd: 84  |  Höjd: 78  |  Storlek: 4.8 KiB

Binär
assets/images/icon004.gif Visa fil

Före Efter
Bredd: 80  |  Höjd: 80  |  Storlek: 14 KiB

Binär
assets/images/icon01.png Visa fil

Före Efter
Bredd: 46  |  Höjd: 46  |  Storlek: 1.5 KiB

Binär
assets/images/no.png Visa fil

Före Efter
Bredd: 80  |  Höjd: 80  |  Storlek: 2.7 KiB

Binär
assets/images/pay-success.png Visa fil

Före Efter
Bredd: 70  |  Höjd: 70  |  Storlek: 3.8 KiB

Binär
assets/images/share.png Visa fil

Före Efter
Bredd: 184  |  Höjd: 60  |  Storlek: 5.2 KiB

Binär
assets/images/shixiao.png Visa fil

Före Efter
Bredd: 280  |  Höjd: 202  |  Storlek: 28 KiB

Binär
assets/images/success.png Visa fil

Före Efter
Bredd: 936  |  Höjd: 658  |  Storlek: 251 KiB

Binär
assets/images/success01.png Visa fil

Före Efter
Bredd: 111  |  Höjd: 111  |  Storlek: 6.8 KiB

Binär
assets/images/yes.png Visa fil

Före Efter
Bredd: 80  |  Höjd: 80  |  Storlek: 2.7 KiB

+ 0
- 26
dist/card/index.js Visa fil

@@ -1,26 +0,0 @@
Component({
externalClasses: ['i-class'],

options: {
multipleSlots: true
},

properties: {
full: {
type: Boolean,
value: false
},
thumb: {
type: String,
value: ''
},
title: {
type: String,
value: ''
},
extra: {
type: String,
value: ''
}
}
});

+ 0
- 3
dist/card/index.json Visa fil

@@ -1,3 +0,0 @@
{
"component": true
}

+ 0
- 11
dist/card/index.wxml Visa fil

@@ -1,11 +0,0 @@
<view class="i-class i-card {{ full ? 'i-card-full' : '' }}">
<view class="i-class i-card-header">
<view class="i-card-header-content">
<image class="i-card-header-thumb" src="{{ thumb }}" mode="aspectFit" wx:if="{{ thumb }}" />
{{ title }}
</view>
<view class="i-card-header-extra" wx:if="{{ extra }}">{{ extra }}</view>
</view>
<view class="i-class i-card-body"><slot name="content"></slot></view>
<view class="i-class i-card-footer"><slot name="footer"></slot></view>
</view>

+ 0
- 1
dist/card/index.wxss Visa fil

@@ -1 +0,0 @@
.i-card{margin:0 16px;font-size:14px;overflow:hidden;position:relative;background:#fff;border:1rpx solid #dddee1;border-radius:5px}.i-card-full{margin:0;border-left:none;border-right:none;border-radius:0}.i-card-header{display:flex;padding:6px 16px;align-items:center}.i-card-header-content{flex:1;text-align:left}.i-card-header-thumb{display:inline-block;width:64px;height:64px;position:relative;margin-left:auto;margin-right:auto;overflow:hidden;background-size:cover;vertical-align:middle}.i-card-header-title{display:inline-block;vertical-align:middle;font-size:14px;color:#1c2438}.i-card-header-extra{flex:1;text-align:right;font-size:14px;color:#80848f}.i-card-body{position:relative;padding:6px 16px;color:#495060;font-size:14px}.i-card-body::before{content:'';position:absolute;top:0;left:0;width:200%;height:200%;transform:scale(.5);transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e9eaec;border-top-width:1px}.i-card-footer{position:relative;padding:6px 16px;color:#80848f;font-size:12px}

+ 0
- 20
dist/col/index.js Visa fil

@@ -1,20 +0,0 @@
Component({
externalClasses: ['i-class'],

relations: {
'../row/index': {
type: 'parent'
}
},

properties: {
span: {
value: 0,
type: Number
},
offset: {
value: 0,
type: Number
}
}
});

+ 0
- 3
dist/col/index.json Visa fil

@@ -1,3 +0,0 @@
{
"component": true
}

+ 0
- 1
dist/col/index.wxml Visa fil

@@ -1 +0,0 @@
<view class="i-class i-col {{ span ? 'i-col-span-' + span : '' }} {{ offset ? 'i-col-offset-' + offset : '' }}"><slot></slot></view>

+ 0
- 1
dist/col/index.wxss Visa fil

@@ -1 +0,0 @@
.i-col{float:left;box-sizing:border-box;width:0}.i-col-span-1{display:block;width:4.16666667%}.i-col-offset-1{margin-left:4.16666667%}.i-col-span-2{display:block;width:8.33333333%}.i-col-offset-2{margin-left:8.33333333%}.i-col-span-3{display:block;width:12.5%}.i-col-offset-3{margin-left:12.5%}.i-col-span-4{display:block;width:16.66666667%}.i-col-offset-4{margin-left:16.66666667%}.i-col-span-5{display:block;width:20.83333333%}.i-col-offset-5{margin-left:20.83333333%}.i-col-span-6{display:block;width:25%}.i-col-offset-6{margin-left:25%}.i-col-span-7{display:block;width:29.16666667%}.i-col-offset-7{margin-left:29.16666667%}.i-col-span-8{display:block;width:33.33333333%}.i-col-offset-8{margin-left:33.33333333%}.i-col-span-9{display:block;width:37.5%}.i-col-offset-9{margin-left:37.5%}.i-col-span-10{display:block;width:41.66666667%}.i-col-offset-10{margin-left:41.66666667%}.i-col-span-11{display:block;width:45.83333333%}.i-col-offset-11{margin-left:45.83333333%}.i-col-span-12{display:block;width:50%}.i-col-offset-12{margin-left:50%}.i-col-span-13{display:block;width:54.16666667%}.i-col-offset-13{margin-left:54.16666667%}.i-col-span-14{display:block;width:58.33333333%}.i-col-offset-14{margin-left:58.33333333%}.i-col-span-15{display:block;width:62.5%}.i-col-offset-15{margin-left:62.5%}.i-col-span-16{display:block;width:66.66666667%}.i-col-offset-16{margin-left:66.66666667%}.i-col-span-17{display:block;width:70.83333333%}.i-col-offset-17{margin-left:70.83333333%}.i-col-span-18{display:block;width:75%}.i-col-offset-18{margin-left:75%}.i-col-span-19{display:block;width:79.16666667%}.i-col-offset-19{margin-left:79.16666667%}.i-col-span-20{display:block;width:83.33333333%}.i-col-offset-20{margin-left:83.33333333%}.i-col-span-21{display:block;width:87.5%}.i-col-offset-21{margin-left:87.5%}.i-col-span-22{display:block;width:91.66666667%}.i-col-offset-22{margin-left:91.66666667%}.i-col-span-23{display:block;width:95.83333333%}.i-col-offset-23{margin-left:95.83333333%}.i-col-span-24{display:block;width:100%}.i-col-offset-24{margin-left:100%}

+ 0
- 22
dist/icon/index.js Visa fil

@@ -1,22 +0,0 @@
Component({
externalClasses: ['i-class'],

properties: {
type: {
type: String,
value: ''
},
custom: {
type: String,
value: ''
},
size: {
type: Number,
value: 14
},
color: {
type: String,
value: ''
}
}
});

+ 0
- 3
dist/icon/index.json Visa fil

@@ -1,3 +0,0 @@
{
"component": true
}

+ 0
- 1
dist/icon/index.wxml Visa fil

@@ -1 +0,0 @@
<view class="i-class i-icon {{ type === '' ? '' : 'i-icon-' + type }} {{ custom }}" style="font-size: {{ size }}px; {{ color ? 'color:' + color : '' }}"></view>

+ 0
- 1
dist/icon/index.wxss
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 62
dist/tab-bar-item/index.js Visa fil

@@ -1,62 +0,0 @@
Component({
externalClasses: ['i-class'],

relations: {
'../tab-bar/index': {
type: 'parent'
}
},

properties: {
icon: {
type: String,
value: ''
},
currentIcon: {
type: String,
value: ''
},
img: {
type: String,
value: ''
},
currentImg: {
type: String,
value: ''
},
key: {
type: String,
value: ''
},
title: {
type: String,
value: ''
},
dot: {
type: Boolean,
value: false
},
count: {
type: Number,
value: 0
}
},

data: {
current: false,
currentColor: ''
},

methods: {
changeCurrent (current) {
this.setData({ current });
},
changeCurrentColor (currentColor) {
this.setData({ currentColor });
},
handleClickItem () {
const parent = this.getRelationNodes('../tab-bar/index')[0];
parent.emitEvent(this.data.key);
}
}
});

+ 0
- 8
dist/tab-bar-item/index.json Visa fil

@@ -1,8 +0,0 @@
{
"component": true,
"usingComponents":
{
"i-badge": "../badge/index",
"i-icon": "../icon/index"
}
}

+ 0
- 10
dist/tab-bar-item/index.wxml Visa fil

@@ -1,10 +0,0 @@
<view class="i-class i-tab-bar-item">
<i-badge dot="{{ dot }}" count="{{ dot ? 0 : count }}">
<view>
<i-icon wx:if="{{ icon || currentIcon }}" i-class="i-tab-bar-item-icon {{ current ? 'item-index--i-tab-bar-item-icon-current' : '' }}" color="{{ current ? currentColor : '' }}" type="{{ current ? currentIcon : icon }}" size="22"></i-icon>
<image wx:else class="i-tab-bar-item-img" src="{{ current ? currentImg : img }}"></image>
<view class="i-tab-bar-item-title {{ current ? 'i-tab-bar-item-title-current' : '' }}" wx:if="{{ current && currentColor }}" style="color: {{ currentColor }}">{{ title }}</view>
<view class="i-tab-bar-item-title {{ current ? 'i-tab-bar-item-title-current' : '' }}" wx:else>{{ title }}</view>
</view>
</i-badge>
</view>

+ 0
- 1
dist/tab-bar-item/index.wxss Visa fil

@@ -1 +0,0 @@
.i-tab-bar-item{flex:1;display:flex;width:100%;-webkit-box-pack:center;justify-content:center;-webkit-box-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;text-align:center}.i-tab-bar-item-icon{display:flex;-webkit-box-pack:center;justify-content:center;box-sizing:border-box;color:#80848f}.i-tab-bar-item-icon-current{color:#2d8cf0}.i-tab-bar-item-img{display:flex;-webkit-box-pack:center;justify-content:center;box-sizing:border-box;width:22px;height:22px}.i-tab-bar-item-title{font-size:10px;margin:3px 0 0;line-height:1;text-align:center;box-sizing:border-box;color:#80848f}.i-tab-bar-item-title-current{color:#2d8cf0}.i-tab-bar-item-img{display:flex;-webkit-box-pack:center;justify-content:center;box-sizing:border-box;color:#80848f}

+ 0
- 66
dist/tab-bar/index.js Visa fil

@@ -1,66 +0,0 @@
Component({
externalClasses: ['i-class'],

relations: {
'../tab-bar-item/index': {
type: 'child',
linked () {
this.changeCurrent();
},
linkChanged () {
this.changeCurrent();
},
unlinked () {
this.changeCurrent();
}
}
},

properties: {
current: {
type: String,
value: '',
observer: 'changeCurrent'
},
color: {
type: String,
value: ''
},
fixed: {
type: Boolean,
value: false
}
},

data: {
list: []
},

methods: {
changeCurrent (val = this.data.current) {
let items = this.getRelationNodes('../tab-bar-item/index');
const len = items.length;

if (len > 0) {
const list = [];
items.forEach(item => {
item.changeCurrent(item.data.key === val);
item.changeCurrentColor(this.data.color);
list.push({
key: item.data.key
});
});
this.setData({
list: list
});
}
},
emitEvent (key) {
this.triggerEvent('change', { key });
},
handleClickItem (e) {
const key = e.currentTarget.dataset.key;
this.emitEvent(key);
}
}
});

+ 0
- 3
dist/tab-bar/index.json Visa fil

@@ -1,3 +0,0 @@
{
"component": true
}

+ 0
- 6
dist/tab-bar/index.wxml Visa fil

@@ -1,6 +0,0 @@
<view class="i-class i-tab-bar {{ fixed ? 'i-tab-bar-fixed' : '' }}">
<slot></slot>
<view class="i-tab-bar-list">
<view class="i-tab-bar-layer" wx:for="{{ list }}" wx:key="{{ item.key }}" data-key="{{ item.key }}" bindtap="handleClickItem" style="width: {{ 100 / list.length }}%"></view>
</view>
</view>

+ 0
- 1
dist/tab-bar/index.wxss Visa fil

@@ -1 +0,0 @@
.i-tab-bar{display:flex;width:100%;height:50px;box-sizing:border-box;position:relative;justify-content:space-around;align-items:center;-webkit-box-align:center;background:#fff}.i-tab-bar::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;transform:scale(.5);transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e9eaec;border-top-width:1px}.i-tab-bar-fixed{position:fixed;bottom:0;z-index:2}.i-tab-bar-list{position:absolute;top:0;bottom:0;left:0;right:0}.i-tab-bar-layer{display:block;float:left;height:100%}

+ 1
- 1
ext.json Visa fil

@@ -4,7 +4,7 @@
"ext": { "ext": {
"weappId": "wxea71200db93d756b", "weappId": "wxea71200db93d756b",
"name": "富茂客官开发", "name": "富茂客官开发",
"appVersion": "C.3.5.9",
"appVersion": "C.3.5.12",
"attr": { "attr": {
"ifHaveCarModular": "1", "ifHaveCarModular": "1",
"etcpversion": "release", "etcpversion": "release",


+ 3
- 0
pages/bargain/bargain.js Visa fil

@@ -8,6 +8,9 @@ Page({
data: { data: {
bannerUrl: imgurl.banner.url, bannerUrl: imgurl.banner.url,
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
bargaincancel: imgurl.bargaincancel.url,
bargainfail: imgurl.bargainfail.url,
bargainsuccess: imgurl.bargainsuccess.url,
bargaingoods: true, bargaingoods: true,
mybargain: false, mybargain: false,
list: [], list: [],


+ 3
- 8
pages/bargain/bargain.wxml Visa fil

@@ -37,23 +37,18 @@
</view> </view>
<view class='again' wx:if="{{item.orderStatus == 7}}" data-id="{{item.id}}" bindtap="inviteFriend"> <view class='again' wx:if="{{item.orderStatus == 7}}" data-id="{{item.id}}" bindtap="inviteFriend">
<view class="botton2" hover-class="none" hover-stop-propagation="false">立即支付</view> <view class="botton2" hover-class="none" hover-stop-propagation="false">立即支付</view>
<image class="icon" src="./../../assets/images/bargainsuccess.png" lazy-load="true"/>
<image class="icon" src="{{bargainsuccess}}" lazy-load="true"/>
</view> </view>
<view class='again' wx:if="{{item.orderStatus == 8||item.orderStatus == 6&&todayDate>item.pressEndDate}}" data-couponChannelId="{{item.couponChannelId}}" data-couponId="{{item.productId}}" data-id="{{item.id}}" bindtap="barginAgain"> <view class='again' wx:if="{{item.orderStatus == 8||item.orderStatus == 6&&todayDate>item.pressEndDate}}" data-couponChannelId="{{item.couponChannelId}}" data-couponId="{{item.productId}}" data-id="{{item.id}}" bindtap="barginAgain">
<view class="botton3" hover-class="none" hover-stop-propagation="false">重新砍价</view> <view class="botton3" hover-class="none" hover-stop-propagation="false">重新砍价</view>
<image class="icon" src="./../../assets/images/bargainfail.png" lazy-load="true"/>
<image class="icon" src="{{bargainfail}}" lazy-load="true"/>
</view> </view>
<view wx:if="{{item.orderStatus == 2 || item.orderStatus == 9}}"> <view wx:if="{{item.orderStatus == 2 || item.orderStatus == 9}}">
<image class="icon" style="margin-top:60rpx;" src="./../../assets/images/bargaincancel.png" lazy-load="true"/>
<image class="icon" style="margin-top:60rpx;" src="{{bargaincancel}}" lazy-load="true"/>
</view> </view>
</view> </view>
<view class="loading" wx:if="{{loading}}">{{content}}</view> <view class="loading" wx:if="{{loading}}">{{content}}</view>
<!-- <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> -->
</view> </view>
<!-- <view class='dingdan' wx:if="{{lists.length==0}}">
<image src="{{actUrl}}" mode="widthFix"></image>
<text>暂无数据</text>
</view> -->
<view class='no-data01' wx:if='{{flag=="bargaingoods"&&lists.length==0}}'> <view class='no-data01' wx:if='{{flag=="bargaingoods"&&lists.length==0}}'>
<image src='{{actUrl}}'></image> <image src='{{actUrl}}'></image>
<view class='no-data-text'>暂无数据</view> <view class='no-data-text'>暂无数据</view>


+ 4
- 0
pages/bargain/bargainDatail/bargainDatail.js Visa fil

@@ -10,6 +10,10 @@ Page({
*/ */
data: { data: {
bannerUrl: imgurl.banner.url, bannerUrl: imgurl.banner.url,
wmhome: imgurl.wmhome.url,
wmhelp: imgurl.wmhelp.url,
wmsuccess01: imgurl.wmsuccess01.url,
fail: imgurl.fail.url,
data: null, data: null,
from: null, from: null,
day: null, day: null,


+ 3
- 3
pages/bargain/bargainDatail/bargainDatail.wxml Visa fil

@@ -1,4 +1,4 @@
<button class='goback' bindtap='goback'><image src='./../../../assets/images/home.png' mode="widthFix"></image></button>
<button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button>
<view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}"> <view class="bargainDetail" hover-class="none" hover-stop-propagation="false" wx:if="{{showPage}}">
<view class="listitem clearfix" hover-class="none" hover-stop-propagation="false"> <view class="listitem clearfix" hover-class="none" hover-stop-propagation="false">
<image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image> <image class="fl" src="{{data.coverImg}}" lazy-load="true" binderror="" bindload="" mode='aspectFill'></image>
@@ -33,13 +33,13 @@
</view> </view>
<view class='help' wx:if="{{data.orderStatus != 7&&data.orderStatus != 1&&data.orderStatus != 9}}">还需邀请<text>{{data.pressLimitNum-data.orderPressList.length}}</text>位好友,帮忙砍至底价</view> <view class='help' wx:if="{{data.orderStatus != 7&&data.orderStatus != 1&&data.orderStatus != 9}}">还需邀请<text>{{data.pressLimitNum-data.orderPressList.length}}</text>位好友,帮忙砍至底价</view>
<view class="success" wx:if="{{data.orderStatus == 7||data.orderStatus == 1}}" hover-class="none" hover-stop-propagation="false"> <view class="success" wx:if="{{data.orderStatus == 7||data.orderStatus == 1}}" hover-class="none" hover-stop-propagation="false">
<image src="./../../../assets/images/success01.png" mode="widthFix"></image>
<image src="{{wmsuccess01}}" mode="widthFix"></image>
<text class="" selectable="false" space="false" decode="false"> <text class="" selectable="false" space="false" decode="false">
已砍至底价 已砍至底价
</text> </text>
</view> </view>
<view class='helpDiscount' wx:if="{{data.orderStatus == 6&&discountStatus == 2}}"> <view class='helpDiscount' wx:if="{{data.orderStatus == 6&&discountStatus == 2}}">
<image bindtap='helpDiscount' src='./../../../assets/images/help.gif' mode='widthFix'></image>
<image bindtap='helpDiscount' src='{{wmhelp}}' mode='widthFix'></image>
</view> </view>
</view> </view>




+ 1
- 0
pages/cardorder/index/index.js Visa fil

@@ -10,6 +10,7 @@ Page({
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
canTransferred: imgurl.canTransferred.url, canTransferred: imgurl.canTransferred.url,
weixinTitle: imgurl.weixinTitle.url, weixinTitle: imgurl.weixinTitle.url,
shixiao: imgurl.shixiao.url,
tabs: [{ tabs: [{
key: 4, key: 4,
name: "使用中" name: "使用中"


+ 1
- 1
pages/cardorder/index/index.wxml Visa fil

@@ -36,7 +36,7 @@
<text class='txtstatus' wx:if="{{item.couponOrderStatus == 8}}">已转赠好友</text> <text class='txtstatus' wx:if="{{item.couponOrderStatus == 8}}">已转赠好友</text>
</view> </view>
<view class='imgicon' wx:if="{{item.showImg}}"> <view class='imgicon' wx:if="{{item.showImg}}">
<image src='./../../../assets/images/shixiao.png' mode='widthFix'></image>
<image src='{{shixiao}}' mode='widthFix'></image>
</view> </view>
</view> </view>
</view> </view>


+ 3
- 0
pages/coupon/detail/index.js Visa fil

@@ -13,6 +13,9 @@ Page({
headbgUrl: imgurl.headbg.url, headbgUrl: imgurl.headbg.url,
quesBgUrl: imgurl.ques_bg.url, quesBgUrl: imgurl.ques_bg.url,
close02: imgurl.close02.url, close02: imgurl.close02.url,
share01: imgurl.share01.url,
fail: imgurl.fail.url,
share01: imgurl.share01.url,
hidden: "hidden", hidden: "hidden",
height: "", height: "",
more: "点击查看更多", more: "点击查看更多",


+ 3
- 3
pages/coupon/detail/index.wxml Visa fil

@@ -7,7 +7,7 @@
</view> </view>
<view class='coupons_info' style='position:relative;z-index:9'> <view class='coupons_info' style='position:relative;z-index:9'>
<view class='fenxiang'> <view class='fenxiang'>
<image class="fenxiang" src='./../../../assets/images/share.png' mode="widthFix"></image>
<image class="fenxiang" src='{{share01}}' mode="widthFix"></image>
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button>
</view> </view>
<view> <view>
@@ -93,7 +93,7 @@
</view> </view>


<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};"> <view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};">
<button class='goback' bindtap='goback'><image src='./../../../assets/images/home.png' mode="widthFix"></image></button>
<button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button>
<button bindtap='gotopay' disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> <button bindtap='gotopay' disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button> <text class='txt'>{{data.salePriceStr}}元</text>马上购买</button>
<button bindtap='gotopay' disabled='{{showbutton}}' class='buy' wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> <button bindtap='gotopay' disabled='{{showbutton}}' class='buy' wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button>
@@ -104,7 +104,7 @@
</view> </view>
</view> </view>
<view wx:if="{{data.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" hover-stop-propagation="false"> <view wx:if="{{data.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" hover-stop-propagation="false">
<button class='goback' bindtap='goback'><image src='./../../../assets/images/home.png' mode="widthFix"></image></button>
<button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button>
<button class="fl" bindtap='gotopay' data-discount='discount1' disabled='{{showbutton}}'> <button class="fl" bindtap='gotopay' data-discount='discount1' disabled='{{showbutton}}'>
<text>{{data.priceStr}}元</text> <text>{{data.priceStr}}元</text>
<text>立即购买</text> <text>立即购买</text>


+ 1
- 0
pages/coupon/detail/index.wxss Visa fil

@@ -66,6 +66,7 @@ button::after{ border: none; }


.title { .title {
display: block; display: block;
font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #000; color: #000;
letter-spacing: 1.09rpx; letter-spacing: 1.09rpx;


+ 1
- 0
pages/couponorder/index/index.js Visa fil

@@ -8,6 +8,7 @@ Page({
couponUrl: imgurl.coupon.url, couponUrl: imgurl.coupon.url,
linessUrl: imgurl.liness.url, linessUrl: imgurl.liness.url,
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
wmgive: imgurl.wmgive.url,
tabs: [{ tabs: [{
key: 0, key: 0,
name: "未使用" name: "未使用"


+ 1
- 1
pages/couponorder/index/index.wxml Visa fil

@@ -41,7 +41,7 @@
</view> </view>
</view> </view>
</view> </view>
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='./../../../assets/images/give.png' mode='widthFix'></image>
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image>
</view> </view>
<view class="loading" wx:if="{{loading}}"> <view class="loading" wx:if="{{loading}}">
<image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}}


+ 1
- 0
pages/czdetail/czdetail.js Visa fil

@@ -14,6 +14,7 @@ Page({
list:[], list:[],
showcontent:false, showcontent:false,
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
bgg: imgurl.bgg.url,
allow_load: true allow_load: true
}, },




+ 1
- 1
pages/czdetail/czdetail.wxml Visa fil

@@ -2,7 +2,7 @@
<text>当前</text> <text>当前</text>
<text>{{score}}</text> <text>{{score}}</text>
<view class='rule' bindtap='gotorule'>规则</view> <view class='rule' bindtap='gotorule'>规则</view>
<image class='bg' src='./../../assets/images/bgg.png' mode='widthFix'></image>
<image class='bg' src='{{bgg}}' mode='widthFix'></image>
</view> </view>
<view class=''> <view class=''>
<text class='title'>成长值明细</text> <text class='title'>成长值明细</text>


+ 1
- 4
pages/main/bargain/index.json Visa fil

@@ -1,6 +1,3 @@
{ {
"component": true,
"usingComponents": {
"i-card": "../../../dist/card/index"
}
"component": true
} }

+ 1
- 4
pages/main/spellGroup/index.json Visa fil

@@ -1,6 +1,3 @@
{ {
"component": true,
"usingComponents": {
"i-card": "../../../dist/card/index"
}
"component": true
} }

+ 2
- 0
pages/order/index/index.js Visa fil

@@ -7,6 +7,8 @@ Page({
data: { data: {
dingdanUrl: imgurl.dingdan.url, dingdanUrl: imgurl.dingdan.url,
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
wmdiscount: imgurl.wmdiscount.url,
wmgive: imgurl.wmgive.url,
tabs: [{ tabs: [{
key: "all", key: "all",
name: "全部" name: "全部"


+ 3
- 3
pages/order/index/index.wxml Visa fil

@@ -10,8 +10,8 @@
</view> </view>
<view class='info'> <view class='info'>
<view> <view>
<image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="./../../../assets/images/discount.png" class="discount" mode="widthFix"></image>
<image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="./../../../assets/images/discount.png" class="discount" mode="widthFix"></image>
<image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image>
<image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image>
<text>{{item.title}}</text> <text>{{item.title}}</text>
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> <text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text>
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> <text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text>
@@ -33,7 +33,7 @@
<view class="sub">{{item.subTitle}}</view> <view class="sub">{{item.subTitle}}</view>
<view class="value" wx:if="{{item.type != 8}}">面额:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> <view class="value" wx:if="{{item.type != 8}}">面额:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view>
<view class="value" wx:if="{{item.type == 8}}">原价:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> <view class="value" wx:if="{{item.type == 8}}">原价:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view>
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='./../../../assets/images/give.png' mode='widthFix'></image>
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image>
<view class="value">下单时间:<text>{{item.createDate}}</text> <view class="value">下单时间:<text>{{item.createDate}}</text>
</view> </view>


+ 3
- 1
pages/paySuccess/paySuccess.js Visa fil

@@ -1,11 +1,13 @@


let Util = require("../../utils/util"); let Util = require("../../utils/util");
const imgurl = require("../../utils/imgurl");
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
data:null
data:null,
pay_success: imgurl.pay_success.url
}, },


/** /**


+ 1
- 1
pages/paySuccess/paySuccess.wxml Visa fil

@@ -4,7 +4,7 @@
<view class="payBody"> <view class="payBody">
<view class="payIcon"> <view class="payIcon">
<view class="payIcon-body"> <view class="payIcon-body">
<image src='./../../assets/images/pay-success.png' mode="widthFix"></image>
<image src='{{pay_success}}' mode="widthFix"></image>
<text>支付成功</text> <text>支付成功</text>
</view> </view>
</view> </view>


+ 1
- 0
pages/rushToBuy/index.js Visa fil

@@ -10,6 +10,7 @@ Page({
data: { data: {
linesUrl: imgurl.lines.url, linesUrl: imgurl.lines.url,
loadingUrl: imgurl.loading.url, loadingUrl: imgurl.loading.url,
wmgift: imgurl.wmgift.url,
list: [], list: [],
page: 1, page: 1,
allow_load: true, allow_load: true,


+ 1
- 1
pages/rushToBuy/index.wxml Visa fil

@@ -42,7 +42,7 @@
</view> </view>
</view> </view>
<view class='expect' wx:if="{{list.length==0}}"> <view class='expect' wx:if="{{list.length==0}}">
<image src='./../../assets/images/gift.png' mode='widthFix'></image>
<image src='{{wmgift}}' mode='widthFix'></image>
<text>请您敬请期待</text> <text>请您敬请期待</text>
<text>我们正在筹备一大堆优惠活动</text> <text>我们正在筹备一大堆优惠活动</text>
</view> </view>


+ 4
- 1
pages/scanPay/scanPay.js Visa fil

@@ -1,6 +1,7 @@
const util = require("../../utils/util.js"); const util = require("../../utils/util.js");
const config = require("../../config/config.js"); const config = require("../../config/config.js");
const Http = require("../../utils/HttpBasics"); const Http = require("../../utils/HttpBasics");
const imgurl = require("../../utils/imgurl");
const AUTH_MODE = 'fingerPrint'; const AUTH_MODE = 'fingerPrint';
let app = getApp(); let app = getApp();
Page({ Page({
@@ -15,7 +16,9 @@ Page({
arrays: [], arrays: [],
showModel: false, showModel: false,
showInput:false, showInput:false,
ids: ""
ids: "",
wmyes: imgurl.wmyes.url,
wmclose: imgurl.wmclose.url
}, },


/** /**


+ 2
- 2
pages/scanPay/scanPay.wxml Visa fil

@@ -13,7 +13,7 @@
<view class='zhezhao'></view> <view class='zhezhao'></view>
<view class='card-model'> <view class='card-model'>
<view class='card-top'> <view class='card-top'>
余额不足,请选择其他消费卡支付<image bindtap='showModel' class='close' src='./../../assets/images/close.png'></image>
余额不足,请选择其他消费卡支付<image bindtap='showModel' class='close' src='{{wmclose}}'></image>
</view> </view>
<view class='card-content'> <view class='card-content'>
<scroll-view scroll-y style="height: 500rpx;" bindscroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}"> <scroll-view scroll-y style="height: 500rpx;" bindscroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
@@ -27,7 +27,7 @@
<view class='card-items-right'> <view class='card-items-right'>
<view class='card-items-right-text'>余额:{{item.remainingAmount/100}}元</view> <view class='card-items-right-text'>余额:{{item.remainingAmount/100}}元</view>
<view class='card-items-right-radio' class='icons'> <view class='card-items-right-radio' class='icons'>
<image wx:if="{{item.id == ids&&item.flag}}" src='./../../assets/images/yes.png' mode='widthFix'></image>
<image wx:if="{{item.id == ids&&item.flag}}" src='{{wmyes}}' mode='widthFix'></image>
</view> </view>
</view> </view>
</view> </view>


+ 1
- 1
pages/spellGroup/mySpellGroup/index.wxml Visa fil

@@ -33,7 +33,7 @@
</view> </view>
</view> </view>
<view class='p-des'> <view class='p-des'>
<view class='p-title'>购买须知</view>
<view class='p-title'>购买须知</view>
<view class='p-list'>{{data.remark}}</view> <view class='p-list'>{{data.remark}}</view>
</view> </view>
<view class='posi'> <view class='posi'>


+ 1
- 9
pages/spellGroup/mySpellGroup/index.wxss Visa fil

@@ -57,7 +57,6 @@
margin-top: -25rpx; margin-top: -25rpx;
opacity: 1; opacity: 1;
font-size:32rpx; font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold; font-weight:bold;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
box-sizing: border-box; box-sizing: border-box;
@@ -170,9 +169,7 @@
margin: 40rpx auto 0; margin: 40rpx auto 0;
} }
.p-title{ .p-title{
font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
font-size:30rpx;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
margin: 10rpx 0 20rpx 0; margin: 10rpx 0 20rpx 0;
} }
@@ -255,8 +252,6 @@
display: inline; display: inline;
font-size:27rpx; font-size:27rpx;
line-height: 27rpx; line-height: 27rpx;
margin-top: 11rpx;
font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }
@@ -264,7 +259,6 @@
text-align: center; text-align: center;
font-size:30rpx; font-size:30rpx;
line-height: 40rpx; line-height: 40rpx;
font-family:PingFang-SC-Medium;
font-weight:500; font-weight:500;
color:rgba(254,254,254,1); color:rgba(254,254,254,1);
} }
@@ -273,8 +267,6 @@
} }
.applyshop{ .applyshop{
font-size:32rpx; font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
margin: 10rpx 0 20rpx 0; margin: 10rpx 0 20rpx 0;
} }


+ 1
- 1
project.config.json Visa fil

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


+ 62
- 0
utils/imgurl.js Visa fil

@@ -40,6 +40,10 @@ module.exports = {
'url': baseUrl + 'banner.png', 'url': baseUrl + 'banner.png',
'name': '' 'name': ''
}, },
'wmclose': {
'url': baseUrl + 'wmclose.png',
'name': '余额不足'
},
'bg': { 'bg': {
'url': baseUrl + 'bg.png', 'url': baseUrl + 'bg.png',
'name': '' 'name': ''
@@ -108,6 +112,10 @@ module.exports = {
'url': baseUrl + 'gift.png', 'url': baseUrl + 'gift.png',
'name': '' 'name': ''
}, },
'wmgift': {
'url': baseUrl + 'wmgift.png',
'name': ''
},
'gou': { 'gou': {
'url': baseUrl + 'gou.png', 'url': baseUrl + 'gou.png',
'name': '' 'name': ''
@@ -276,6 +284,10 @@ module.exports = {
'url': baseUrl + 'share.png', 'url': baseUrl + 'share.png',
'name': '' 'name': ''
}, },
'share01': {
'url': baseUrl + 'share01.png',
'name': '分享'
},
'spcode': { 'spcode': {
'url': baseUrl + 'spcode.png', 'url': baseUrl + 'spcode.png',
'name': '' 'name': ''
@@ -436,4 +448,54 @@ module.exports = {
'url': baseUrl + 'bargindetailbg.jpg', 'url': baseUrl + 'bargindetailbg.jpg',
'name': '砍价详情背景图' 'name': '砍价详情背景图'
}, },
'bargaincancel': {
'url': baseUrl + 'bargaincancel.png',
'name': '砍价取消'
},
'bargainfail': {
'url': baseUrl + 'bargainfail.png',
'name': '砍价失败'
},
'bargainsuccess': {
'url': baseUrl + 'bargainsuccess.png',
'name': '砍价成功'
},
'wmdiscount': {
'url': baseUrl + 'wmdiscount.png',
'name': '砍价图标'
},
'bgg': {
'url': baseUrl + 'bgg.png',
'name': 'banner背景'
},
'wmgive': {
'url': baseUrl + 'wmgive.png',
'name': '赠送'
},
'wmyes': {
'url': baseUrl + 'wmyes.png',
'name': '成功'
},
'wmhome': {
'url': baseUrl + 'wmhome.png',
'name': '首页'
},
'wmhelp': {
'url': baseUrl + 'wmhelp.gif',
'name': '帮助好友砍价'
},
'wmsuccess01': {
'url': baseUrl + 'wmsuccess01.png',
'name': '帮好友砍价成功对勾'
},
'pay_success': {
'url': baseUrl + 'pay-success.png',
'name': '消费卡付款成功'
},
'shixiao': {
'url': baseUrl + 'shixiao.png',
'name': '失效'
},

} }

Laddar…
Avbryt
Spara