瀏覽代碼

Merge branch 'checkUser' into product

dev_czc
HolyKnightIX 2 年之前
父節點
當前提交
3c79252f18
共有 17 個文件被更改,包括 449 次插入321 次删除
  1. 二進制
      assets/images/gift.png
  2. +2
    -1
      components/commodityMould/commodityMould.wxss
  3. +20
    -30
      ext.json
  4. +2
    -0
      index/passCar.js
  5. +2
    -3
      index/user.js
  6. +3
    -2
      pages/ConsumeDetail/ConsumeDetail.js
  7. +12
    -12
      pages/addPark/addPark.js
  8. +4
    -1
      pages/coupon/detail/index.js
  9. +36
    -24
      pages/coupon/detail/index.wxml
  10. +1
    -1
      pages/coupon/detail/index.wxss
  11. +1
    -1
      pages/getphoneInfo/index.js
  12. +1
    -1
      pages/index/searchbar/detail/index.js
  13. +10
    -1
      pages/passCar/showList/showList.js
  14. +5
    -1
      pages/spellGroup/mySpellGroup/index.js
  15. +37
    -21
      pages/spellGroup/mySpellGroup/index.wxml
  16. +312
    -221
      pages/spellGroup/mySpellGroup/index.wxss
  17. +1
    -1
      project.config.json

二進制
assets/images/gift.png 查看文件

Before After
Width: 857  |  Height: 691  |  Size: 66 KiB

+ 2
- 1
components/commodityMould/commodityMould.wxss 查看文件

@@ -242,6 +242,7 @@
font-family: OPPOSans; font-family: OPPOSans;
font-weight: 500; font-weight: 500;
color: #999; color: #999;
margin-top: 50rpx;
} }


.product { .product {
@@ -256,4 +257,4 @@
height: 100%; height: 100%;
display: block; display: block;
width: 100%; width: 100%;
}
}

+ 20
- 30
ext.json 查看文件

@@ -2,47 +2,35 @@
"ext": { "ext": {
"attr": { "attr": {
"car": { "car": {
"tjd": {
"payPath": "",
"tjdAppId": "wx6945d1bda68d7993"
},
"etcp": { "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": "1630349477",
"mchId": "1604439800",
"imgProxy": [ "imgProxy": [
{ {
"newUrl": "https://c.malls.iformall.com/img",
"newUrl": "https://ctest.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" "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" "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" "orgUrl": "https://wx.qlogo.cn"
} }
], ],
"mchIdOld": "1604439800",
"configUrl": "https://c.malls.iformall.com/C/api",
"ifStoreApp": "0",
"configUrl": "https://ctest.malls.iformall.com/C/api",
"businessSwitch": "1", "businessSwitch": "1",
"businessVersion": "1",
"ifHaveWebSocket": "0", "ifHaveWebSocket": "0",
"ifHaveCarModular": "0"
"ifHaveCarModular": "1"
}, },
"name": "琅琊金鹏玖玖广场",
"weappId": "wx6af487474e8b7fb3",
"appVersion": "C.5.1.1"
"name": "金泸商务",
"weappId": "wx649b3be73c1afe47",
"appVersion": "C.test.5.2.0"
}, },
"debug": false, "debug": false,
"tabBar": { "tabBar": {
@@ -78,7 +66,8 @@
"selectedIconPath": "assets/images/user-a.png" "selectedIconPath": "assets/images/user-a.png"
} }
], ],
"custom": true
"color": "#abb1be",
"selectedColor": "#b2743d"
}, },
"window": { "window": {
"backgroundTextStyle": "dark", "backgroundTextStyle": "dark",
@@ -88,15 +77,15 @@
}, },
"plugins": { "plugins": {
"auto-points-plugin": { "auto-points-plugin": {
"version": "2.4.0",
"version": "1.3.0",
"provider": "wxfab2bf944bfc4da6" "provider": "wxfab2bf944bfc4da6"
}, },
"live-player-plugin": { "live-player-plugin": {
"version": "1.2.5",
"version": "1.3.4",
"provider": "wx2b03c6e691cd7370" "provider": "wx2b03c6e691cd7370"
} }
}, },
"extAppid": "wx6af487474e8b7fb3",
"extAppid": "wx649b3be73c1afe47",
"extEnable": true, "extEnable": true,
"permission": { "permission": {
"scope.userLocation": { "scope.userLocation": {
@@ -109,6 +98,7 @@
"downloadFile": 10000 "downloadFile": 10000
}, },
"requiredPrivateInfos": [ "requiredPrivateInfos": [
"chooseLocation"
"chooseLocation",
"getLocation"
] ]
} }

+ 2
- 0
index/passCar.js 查看文件

@@ -328,6 +328,7 @@ Page({
showCancel: false, showCancel: false,
}) })
}, },

onShow: function (options) { onShow: function (options) {
var that = this; var that = this;
Http.get({ Http.get({
@@ -403,6 +404,7 @@ Page({
that.getParkStatus(); that.getParkStatus();
}) })
}, },

cancelMove: function () { cancelMove: function () {
console.log(111) console.log(111)
return false; return false;


+ 2
- 3
index/user.js 查看文件

@@ -102,7 +102,7 @@ Page({
}, },
//是否授权手机号 //是否授权手机号
ifPhoneInfo() { ifPhoneInfo() {
let that = this;
const that = this
Http.get({ Http.get({
url: config.api.checkPhoneStatus, url: config.api.checkPhoneStatus,
data: {} data: {}
@@ -627,6 +627,5 @@ Page({
console.log("获取设备信息失败" + e); console.log("获取设备信息失败" + e);
} }
return size; return size;
},

}
}); });

+ 3
- 2
pages/ConsumeDetail/ConsumeDetail.js 查看文件

@@ -166,8 +166,9 @@ Page({
console.log(res); console.log(res);
if (res.code == 200 && res.data.list && res.data.list.length > 0) { if (res.code == 200 && res.data.list && res.data.list.length > 0) {
wx.hideLoading(); wx.hideLoading();
res.data.list.map(file => {
file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
res.data.list.map(item => {
item.updateDate = util.formatTime(item.updateDate, "yyyy-MM-dd hh:mm:ss")
item.createDate = util.formatTime(item.createDate, "yyyy-MM-dd hh:mm:ss")
}) })
that.setData({ that.setData({
showPage: true, showPage: true,


+ 12
- 12
pages/addPark/addPark.js 查看文件

@@ -36,29 +36,29 @@ Page({
], ],
chooseNumFir: [ chooseNumFir: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'], ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
['H', 'J', 'K', 'L', 'M', 'N', 'P',],
['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
['X', 'Y', 'Z', '', '', '','DEL'],
['H', 'J', 'K', 'L', 'M', 'N', 'O'],
['P', 'Q', 'R', 'S', 'T', 'U', 'V'],
['X', 'Y', 'Z', 'W', '', '', 'DEL'],
], ],
chooseNumSco: [ chooseNumSco: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'], ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
['H', 'J', 'K', 'L', 'M', 'N', 'P'], ['H', 'J', 'K', 'L', 'M', 'N', 'P'],
['Q', 'R', 'S', 'T', 'U', 'V', 'W'], ['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
['X', 'Y', 'Z', '1', '2','3', '4'],
['X', 'Y', 'Z', '1', '2', '3', '4'],
['5', '6', '7', '8', '9', '0', 'DEL'], ['5', '6', '7', '8', '9', '0', 'DEL'],
], ],
chooseSpec: [ chooseSpec: [
['A', 'B', 'C', 'D', 'E', 'F', 'G'], ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
['H', 'J', 'K', 'L', 'M', 'N', 'P'], ['H', 'J', 'K', 'L', 'M', 'N', 'P'],
['Q', 'R', 'S', 'T', 'U', 'V', 'W'], ['Q', 'R', 'S', 'T', 'U', 'V', 'W'],
['X', 'Y', 'Z', '港', '澳','1', '2'],
['X', 'Y', 'Z', '港', '澳', '1', '2'],
['3', '4', '5', '6', '7', '8', '9'], ['3', '4', '5', '6', '7', '8', '9'],
['0', '', '', '', "", "",'DEL']
['0', '', '', '', "", "", 'DEL']
], ],
}, },




onLoad: function(options) {
onLoad: function (options) {
let that = this; let that = this;


if (Object.keys(options).length != 0) { if (Object.keys(options).length != 0) {
@@ -67,13 +67,13 @@ Page({
}) })
} }
}, },
jumpTo: function() {
jumpTo: function () {
// 返回 // 返回
wx.navigateBack({ wx.navigateBack({
url: '/index/passCar' url: '/index/passCar'
}) })
}, },
handleTap: function(e) {
handleTap: function (e) {
this.buttonStatus(); this.buttonStatus();
this.setData({ this.setData({
choose: e.target.dataset.cardata, choose: e.target.dataset.cardata,
@@ -114,7 +114,7 @@ Page({


} }
}, },
chooseNum: function(e) {
chooseNum: function (e) {
if (e.target.dataset.msg == 'I') { if (e.target.dataset.msg == 'I') {
return return
} }
@@ -338,7 +338,7 @@ Page({
this.buttonStatus(); this.buttonStatus();
}, },


submit: function() {
submit: function () {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") { if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
var carNumber = '' var carNumber = ''
carNumber += this.data.title + this.data.numFir + this.data.numSco + this.data.numThr + this.data.numFor + this.data.numFive + this.data.numSix carNumber += this.data.title + this.data.numFir + this.data.numSco + this.data.numThr + this.data.numFor + this.data.numFive + this.data.numSix
@@ -361,7 +361,7 @@ Page({
} }
}, },


buttonStatus: function() {
buttonStatus: function () {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") { if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
this.setData({ this.setData({
buttonStatus: true buttonStatus: true


+ 4
- 1
pages/coupon/detail/index.js 查看文件

@@ -710,7 +710,8 @@ Page({
// title: res.data.title // title: res.data.title
// }) // })
that.setData({ that.setData({
barTitle: res.data.title
barTitle: res.data.title,
activityStatus: res.data.activityStatus ? res.data.activityStatus : ''
}) })
var EndTime = res.data.validStartDate; var EndTime = res.data.validStartDate;
var NowTime = new Date().getTime(); var NowTime = new Date().getTime();
@@ -765,6 +766,8 @@ Page({
if (res.data.type == 10) { if (res.data.type == 10) {
that.setData({ that.setData({
salePriceStr: res.data.salePriceStr, salePriceStr: res.data.salePriceStr,
soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"),
soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"),
validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
priceStr: res.data.priceStr, priceStr: res.data.priceStr,


+ 36
- 24
pages/coupon/detail/index.wxml 查看文件

@@ -29,8 +29,8 @@
<view style='text-align:center;display:inline-block;'> <view style='text-align:center;display:inline-block;'>
<image class='clock' src='{{clockUrl}}' mode='widthFix' wx:if="{{data.type!=10}}"></image> <image class='clock' src='{{clockUrl}}' mode='widthFix' wx:if="{{data.type!=10}}"></image>
<image class='clock' src='{{yushouUrl}}' mode='widthFix' wx:if="{{data.type==10}}"></image> <image class='clock' src='{{yushouUrl}}' mode='widthFix' wx:if="{{data.type==10}}"></image>
<text class="qiang" wx:if="{{data.activityStatus!=0}}">距结束 :</text>
<text class="qiang" wx:if="{{data.activityStatus==0}}">距开始 :</text>
<text class="qiang" wx:if="{{activityStatus!=0}}">距结束 :</text>
<text class="qiang" wx:if="{{activityStatus==0}}">距开始 :</text>
</view> </view>
<view wx:if="{{clock=='00'||data.status==1}}" class='times'> <view wx:if="{{clock=='00'||data.status==1}}" class='times'>
已经结束 已经结束
@@ -88,14 +88,17 @@
</view> </view>
</view> </view>




<view class='rest' wx:if="{{data.validType==2}}">自领取之日起 <view class='rest' wx:if="{{data.validType==2}}">自领取之日起
<text class='time'>{{validDays}}</text>天内有效 <text class='time'>{{validDays}}</text>天内有效
<text class="use">(请在有效期内使用)</text> <text class="use">(请在有效期内使用)</text>
</view> </view>

<view class='rest' wx:if="{{data.validType==1 && data.type!=10 && soldStartTime}}">
<text class='time'>售卖期:{{soldStartTime}} 至 {{soldEndTime}}</text>
</view>

<view class='rest' wx:if="{{data.validType==1&&data.type!=10}}"> <view class='rest' wx:if="{{data.validType==1&&data.type!=10}}">
<text class='time'>{{validStartDate}}至{{validEndDate}}</text>
<text class='time'>使用期:{{validStartDate}} {{validEndDate}}</text>
</view> </view>
<view class='rest' wx:if="{{data.type==5}}"> <view class='rest' wx:if="{{data.type==5}}">
<text class='time'>当次有效</text> <text class='time'>当次有效</text>
@@ -163,21 +166,26 @@
<image src='{{homeSelectedO}}' mode="widthFix"></image> <image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text> <text class='btnTxt'>首页</text>
</button> </button>
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11 && data.type!=8 && data.type!=50 && data.type!=51 && priceAndStockObj.salePrice/100!=0 && priceAndStockObj.remainInventory!=0 && endtime!='活动已结束' && activityStatus!=0}}">
<text class='txt'>{{priceAndStockObj.salePrice/100}}元</text>马上购买 <text class='txt'>{{priceAndStockObj.salePrice/100}}元</text>马上购买
</button> </button>
<button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" class="home">配送到家 <button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" class="home">配送到家
</button> </button>
<button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" class="arrive">到店自提 <button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" class="arrive">到店自提
</button> </button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100==0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type !=8 && data.type !=50 && data.type != 51 && priceAndStockObj.salePrice / 100 == 0 && priceAndStockObj.remainInventory !=0 && endtime != '活动已结束' && activityStatus != 0}}">免费领取</button>

<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type == 51 && priceAndStockObj.remainInventory !=0 || data.type == 50 && priceAndStockObj.remainInventory != 0 && activityStatus != 0}}">马上兑换</button>

<button class='buy buyHr' disabled='true' wx:if="{{data.sendType !=3 && activityStatus != 0 && (priceAndStockObj.remainInventory ==0 && endtime != '活动已结束' || priceAndStockObj.remainInventory ==0 && data.type == 8)}}">已售罄</button>

<button class='buy' disabled='true' wx:if="{{priceAndStockObj.remainInventory ==0 && data.type == 50 || priceAndStockObj.remainInventory ==0 && data.type == 51 && activityStatus != 0}}">已兑完</button>


<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type==51&&priceAndStockObj.remainInventory!=0||data.type==50&&priceAndStockObj.remainInventory!=0}}">马上兑换</button>
<button class='buy buyHr' disabled='true' wx:if="{{data.sendType!=3&&(priceAndStockObj.remainInventory==0&&endtime!='活动已结束'||priceAndStockObj.remainInventory==0&&data.type==8)}}">已售罄</button>
<button class='buy' disabled='true' wx:if="{{priceAndStockObj.remainInventory==0&&data.type==50||priceAndStockObj.remainInventory==0&&data.type==51}}">已兑完</button>
<button class='buy' disabled='true' wx:if="{{endtime=='活动已结束'&&data.activityStatus!=0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button>
<button id='noBuy' disabled='true' wx:if="{{data.activityStatus==0}}">活动未开始</button>
<button class='buy' disabled='true' wx:if="{{endtime == '活动已结束' && activityStatus != 0}}">活动已结束</button>

<button class='buy' disabled='true' wx:if="{{total_micro_second <=0 && activityStatus != 0}}">活动已结束</button>

<button id='noBuy' disabled='true' wx:if="{{activityStatus == 0}}">活动未开始</button>
</view> </view>
</form> </form>
</view> </view>
@@ -187,17 +195,21 @@
<image src='{{homeSelectedO}}' mode="widthFix"></image> <image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text> <text class='btnTxt'>首页</text>
</button> </button>
<form bindsubmit="gotopay" report-submit='true' class="fl">
<button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'>
<text>¥{{priceAndStockObj.price/100}}</text>
<text>立即购买</text>
</button>
</form>
<form bindsubmit="inviteFriend" report-submit='true' class="fr">
<button form-type="submit" class="kanjiaBtn" style='background:{{!showbutton1?"transparent":"#ccc"}};' disabled='{{showbutton1}}'>
发起砍价
</button>
</form>

<block wx:if="{{activityStatus != 0}}">
<form bindsubmit="gotopay" report-submit='true' class="fl">
<button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'>
<text>¥{{priceAndStockObj.price/100}}</text>
<text>立即购买</text>
</button>
</form>
<form bindsubmit="inviteFriend" report-submit='true' class="fr">
<button form-type="submit" class="kanjiaBtn" style='background:{{!showbutton1?"transparent":"#ccc"}};' disabled='{{showbutton1}}'>
发起砍价
</button>
</form>
</block>

</view> </view>


<!-- 问卷调查 --> <!-- 问卷调查 -->


+ 1
- 1
pages/coupon/detail/index.wxss 查看文件

@@ -391,7 +391,7 @@ button::after {


#noBuy { #noBuy {
position: relative; position: relative;
background-color: rgba(0, 0, 0, 0.2);
background-color: #00000033;
height: 94rpx; height: 94rpx;
width: 560rpx; width: 560rpx;
margin: 0 auto 30rpx; margin: 0 auto 30rpx;


+ 1
- 1
pages/getphoneInfo/index.js 查看文件

@@ -271,7 +271,7 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: `/pages/integralmall/index` url: `/pages/integralmall/index`
}) })
}else if (that.data.path == 'questionnaire') {
} else if (that.data.path == 'questionnaire') {
wx.navigateTo({ wx.navigateTo({
url: `/pages/questionnaire/questionnaire` url: `/pages/questionnaire/questionnaire`
}) })


+ 1
- 1
pages/index/searchbar/detail/index.js 查看文件

@@ -47,7 +47,7 @@ Page({
}) })
}, },
/** /**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(options, 'options'); console.log(options, 'options');


+ 10
- 1
pages/passCar/showList/showList.js 查看文件

@@ -112,7 +112,16 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
this.getList(this.data.pageNum)
Http.get({
url: config.api.checkPhoneStatus,
data: {}
}).then(res => {
this.getList(this.data.pageNum)
}).catch(err => {
wx.navigateTo({
url: `/pages/getphoneInfo/index?path=passCarList`,
})
})
}, },


/** /**


+ 5
- 1
pages/spellGroup/mySpellGroup/index.js 查看文件

@@ -52,7 +52,8 @@ Page({
merchantVoList: [], merchantVoList: [],
goHomeUrl: "", goHomeUrl: "",
mallList: '', mallList: '',
contentType: ''
contentType: '',
activityStatus: ''
}, },


/** /**
@@ -503,8 +504,11 @@ Page({
data.salePrice = (data.salePrice / 100).toFixed(2); data.salePrice = (data.salePrice / 100).toFixed(2);
data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd')
data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd')
data.soldStartTime = utils.formatTime(data.soldStartTime, 'yyyy-MM-dd')
data.soldEndTime = utils.formatTime(data.soldEndTime, 'yyyy-MM-dd')
that.setData({ that.setData({
data, data,
activityStatus: data.activityStatus
// merchantVoList: data.merchantVoList // merchantVoList: data.merchantVoList
}); });
Http.get({ Http.get({


+ 37
- 21
pages/spellGroup/mySpellGroup/index.wxml 查看文件

@@ -28,9 +28,18 @@
<text class='time refound'><text class="use">过期不退款</text></text> <text class='time refound'><text class="use">过期不退款</text></text>
</text> </text>
</view> </view>
<view class='rest' wx:if="{{data.validType==1}}">
<text class='time'>{{data.validStartDate}}至{{data.validEndDate}}<text class="use">(请在有效期内使用)</text></text>
<view class='rest' wx:if="{{data.validType==1}}" style="margin-bottom: 15rpx;">
<view class='timeX' style="margin-bottom: 10rpx;">
售卖期:{{data.soldStartTime}} 至 {{data.soldEndTime}}
<text class="use"> (请在售卖期内购买)</text>
</view>

<view class='timeX'>
使用期:{{data.validStartDate}} 至 {{data.validEndDate}}
<text class="use"> (请在使用期内使用)</text>
</view>
</view> </view>

<view class='rest'> <view class='rest'>
<!-- <text class='txt01'>限购条件:</text> --> <!-- <text class='txt01'>限购条件:</text> -->
<view class='quan'></view> <view class='quan'></view>
@@ -84,25 +93,32 @@
<image src='{{homeSelectedO}}' mode="widthFix"></image> <image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text> <text class='btnTxt'>首页</text>
</button> </button>
<form bindsubmit='{{canBuyIf?"gotoBuy":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-left' form-type="submit">
<view class='edit-left-top'>
<view class='price'>{{data.price}}</view>
<view class='price-unit'>元</view>
</view>
<view class='edit-left-bottom'>立即购买</view>
</button>
</form>
<!-- <button class='edit-right' id="shareBtn" open-type="share"></button> -->
<form bindsubmit='{{canSpell?"gotoSpell":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-right' form-type="submit">
<view class='edit-left-top'>
<view class='price'>{{data.salePrice}}</view>
<view class='price-unit'>元</view>
</view>
<view class='edit-left-bottom'>发起拼团</view>
</button>
</form>

<block wx:if="{{activityStatus != 0}}">
<form bindsubmit='{{canBuyIf?"gotoBuy":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-left' form-type="submit">
<view class='edit-left-top'>
<view class='price'>{{data.price}}</view>
<view class='price-unit'>元</view>
</view>
<view class='edit-left-bottom'>立即购买</view>
</button>
</form>
<!-- <button class='edit-right' id="shareBtn" open-type="share"></button> -->
<form bindsubmit='{{canSpell?"gotoSpell":""}}' report-submit='true' wx:if='{{data.id}}'>
<button class='edit-right' form-type="submit">
<view class='edit-left-top'>
<view class='price'>{{data.salePrice}}</view>
<view class='price-unit'>元</view>
</view>
<view class='edit-left-bottom'>发起拼团</view>
</button>
</form>
</block>

<block wx:if="{{data.activityStatus == 0}}">
<button id='noBuy' disabled='true'>活动未开始</button>
</block>
</view> </view>
</view> </view>
<!-- 分享弹框 --> <!-- 分享弹框 -->


+ 312
- 221
pages/spellGroup/mySpellGroup/index.wxss 查看文件

@@ -7,52 +7,64 @@
width: 130rpx; width: 130rpx;
text-align: center; text-align: center;
margin-left: 26rpx; margin-left: 26rpx;
color: red!important;
color: red !important;
} }
page{

page {
background: #F4F5F9; background: #F4F5F9;
} }
.top-img{

.top-img {
width: 100%; width: 100%;
height: 533rpx; height: 533rpx;
z-index: 1; z-index: 1;
} }
.top-img image{

.top-img image {
width: 100%; width: 100%;
height: 533rpx; height: 533rpx;
} }

.goback { .goback {
float:left;
width:132rpx!important;
height:96rpx;
background:rgba(255,255,255,1);
line-height:96rpx;
border-radius:32rpx;
margin-right:25rpx;
}
.timess{
float: left;
width: 132rpx !important;
height: 96rpx;
background: rgba(255, 255, 255, 1);
line-height: 96rpx;
border-radius: 32rpx;
margin-right: 25rpx;
}

.timess {
color: #af6e34; color: #af6e34;
} }
.wx-swiper-dots{

.wx-swiper-dots {
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
button::after{ border: none; }
.goback image{

button::after {
border: none;
}

.goback image {
position: absolute; position: absolute;
width:52rpx;
width: 52rpx;
height: 50rpx; height: 50rpx;
left: 0; left: 0;
right: 0; right: 0;
top: 0; top: 0;
bottom:0;
margin:10rpx auto;
bottom: 0;
margin: 10rpx auto;
} }
.content-box{

.content-box {
box-sizing: content-box; box-sizing: content-box;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
.content{

.content {
position: relative; position: relative;
width: 100%; width: 100%;
height: auto; height: auto;
@@ -60,11 +72,13 @@ button::after{ border: none; }
overflow: hidden; overflow: hidden;
padding-bottom: 130rpx; padding-bottom: 130rpx;
} }
.text{

.text {
position: relative; position: relative;
/* padding: 0 30rpx; */ /* padding: 0 30rpx; */
} }
.title{

.title {
position: relative; position: relative;
background-color: #fff; background-color: #fff;
z-index: 10; z-index: 10;
@@ -73,24 +87,26 @@ button::after{ border: none; }
padding-left: 30rpx; padding-left: 30rpx;
line-height: 50rpx; line-height: 50rpx;
opacity: 1; opacity: 1;
font-size:32rpx;
font-weight:bold;
color:rgba(51,51,51,1);
font-size: 32rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
box-sizing: border-box; box-sizing: border-box;
} }
.remark{

.remark {
background: #FFF; background: #FFF;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(134,134,134,1);
font-size: 24rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(134, 134, 134, 1);
line-height: 48rpx; line-height: 48rpx;
padding: 0 80rpx 0 30rpx; padding: 0 80rpx 0 30rpx;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.des{

.des {
width: 100%; width: 100%;
height: auto; height: auto;
padding-top: 6rpx; padding-top: 6rpx;
@@ -99,207 +115,237 @@ button::after{ border: none; }
color: #FD782D; color: #FD782D;
display: flex; display: flex;
} }
.des-peoplenum{

.des-peoplenum {
display: inline; display: inline;
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
line-height:70rpx;
font-size: 24rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
line-height: 70rpx;
} }
.des-saleprice{

.des-saleprice {
display: inline; display: inline;
font-size:40rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
font-size: 40rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
} }
.status{

.status {
width: 100%; width: 100%;
border-radius: 15rpx; border-radius: 15rpx;
background:rgba(255,235,229,1);
background: rgba(255, 235, 229, 1);
margin: 30rpx 0; margin: 30rpx 0;
overflow: hidden; overflow: hidden;
} }
.status01{

.status01 {
float: left; float: left;
width: 130rpx; width: 130rpx;
height: 130rpx; height: 130rpx;
} }
.status01 image{

.status01 image {
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
border-radius: 45rpx; border-radius: 45rpx;
margin: 20rpx 0 0 20rpx; margin: 20rpx 0 0 20rpx;
} }
.status02{

.status02 {
margin-top: 20rpx; margin-top: 20rpx;
float: left; float: left;
width: 140rpx; width: 140rpx;
font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(51, 51, 51, 1);
} }
.r-p-num{

.r-p-num {
display: inline; display: inline;
color: #FF3535; color: #FF3535;
} }
.status03{

.status03 {
width: 264rpx; width: 264rpx;
float: left; float: left;
padding-left: 10rpx; padding-left: 10rpx;
color: #F74812; color: #F74812;
box-sizing: border-box; box-sizing: border-box;
} }
.hh,.mm,.ss{

.hh,
.mm,
.ss {
display: inline-block; display: inline-block;
font-size:26rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,255,255,1);
font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(255, 255, 255, 1);
height: 38rpx; height: 38rpx;
width: 38rpx; width: 38rpx;
background: #F74812; background: #F74812;
border-radius:10rpx;
border-radius: 10rpx;
margin: 46rpx 0 0 0; margin: 46rpx 0 0 0;
text-align: center; text-align: center;
line-height: 38rpx; line-height: 38rpx;
} }
.day-box{

.day-box {
width: 40rpx; width: 40rpx;
text-align: center; text-align: center;
} }
.mao{

.mao {
display: inline-block; display: inline-block;
width: 20rpx; width: 20rpx;
text-align: center; text-align: center;
} }
.status04{

.status04 {
float: left; float: left;
width: 146rpx; width: 146rpx;
} }
.s-button{
background:#ED3D2E;

.s-button {
background: #ED3D2E;
width: 120rpx; width: 120rpx;
height: 48rpx; height: 48rpx;
font-size:28rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(255,255,255,1);
font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(255, 255, 255, 1);
text-align: center; text-align: center;
line-height: 48rpx; line-height: 48rpx;
border-radius: 24rpx; border-radius: 24rpx;
margin: 40rpx auto 0; margin: 40rpx auto 0;
} }
.p-title{
font-size:30rpx;
color:rgba(51,51,51,1);

.p-title {
font-size: 30rpx;
color: rgba(51, 51, 51, 1);
margin: 10rpx 0 20rpx 0; margin: 10rpx 0 20rpx 0;
} }
.p-list{
font-size:24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
line-height:50rpx;
}
.edit{
position:fixed;
bottom:0;
left:0;
right:0;
padding:20rpx 22rpx;
background:transparent!important;
}
.edit-left{

.p-list {
font-size: 24rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(51, 51, 51, 1);
line-height: 50rpx;
}

.edit {
position: fixed;
bottom: 0;
left: 0;
right: 0;
padding: 20rpx 22rpx;
background: transparent !important;
}

.edit-left {
float: left; float: left;
width: 268rpx; width: 268rpx;
height: 96rpx; height: 96rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:32rpx;
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
border-radius: 32rpx;
} }
.edit-right{

.edit-right {
float: right; float: right;
width: 268rpx; width: 268rpx;
height: 96rpx; height: 96rpx;
line-height: 46rpx; line-height: 46rpx;
background:linear-gradient(90deg,rgba(40,179,255,1) 0%,rgba(48,103,255,1) 100%);
border-radius:32rpx;
background: linear-gradient(90deg, rgba(40, 179, 255, 1) 0%, rgba(48, 103, 255, 1) 100%);
border-radius: 32rpx;
} }
.btnTxt{

.btnTxt {
width: 50rpx; width: 50rpx;
height: 30rpx; height: 30rpx;
line-height: 50rpx; line-height: 50rpx;
color: #FD782D; color: #FD782D;
font-size: 20rpx; font-size: 20rpx;
position: absolute; position: absolute;
right:42rpx ;
right: 42rpx;
bottom: 15rpx; bottom: 15rpx;
} }
.edit-left-top{

.edit-left-top {
height: 46rpx; height: 46rpx;
text-align: center; text-align: center;
line-height:65rpx;
line-height: 65rpx;
} }
.price{

.price {
display: inline; display: inline;
font-size:32rpx;
font-size: 32rpx;
line-height: 32rpx; line-height: 32rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(254,254,254,1);
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }
.price-unit{

.price-unit {
display: inline; display: inline;
font-size:27rpx;
font-size: 27rpx;
line-height: 27rpx; line-height: 27rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(254,254,254,1);
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }
.edit-left-bottom{

.edit-left-bottom {
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;
color:rgba(254,254,254,1);
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }


.edit-right-top{
.edit-right-top {
line-height: 32rpx; line-height: 32rpx;
text-align: center; text-align: center;
margin-top: 13rpx; margin-top: 13rpx;
} }
.real-price{

.real-price {
display: inline; display: inline;
font-size:32rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(254,254,254,1);
font-size: 32rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }
.real-price-unit{

.real-price-unit {
display: inline; display: inline;
font-size:27rpx;
font-size: 27rpx;
line-height: 27rpx; line-height: 27rpx;
font-weight:500;
color:rgba(254,254,254,1);
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }
.edit-right-bottom{

.edit-right-bottom {
text-align: center; text-align: center;
font-size:30rpx;
font-size: 30rpx;
line-height: 40rpx; line-height: 40rpx;
font-weight:500;
color:rgba(254,254,254,1);
font-weight: 500;
color: rgba(254, 254, 254, 1);
} }

.posi { .posi {
position: relative; position: relative;
background: #FFF; background: #FFF;
margin-top: 18rpx; margin-top: 18rpx;
padding: 15rpx 30rpx
padding: 15rpx 30rpx
} }
.applyshop{
font-size:32rpx;
color:rgba(51,51,51,1);

.applyshop {
font-size: 32rpx;
color: rgba(51, 51, 51, 1);
margin: 10rpx 0 20rpx 0; margin: 10rpx 0 20rpx 0;
} }


@@ -364,6 +410,7 @@ button::after{ border: none; }
height: 36rpx; height: 36rpx;
overflow: hidden; overflow: hidden;
} }

.tel { .tel {
right: 0; right: 0;
top: 0; top: 0;
@@ -372,6 +419,7 @@ button::after{ border: none; }
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
} }

.rest { .rest {
font-size: 24rpx; font-size: 24rpx;
color: #919191; color: #919191;
@@ -383,9 +431,11 @@ button::after{ border: none; }
background: #FFF; background: #FFF;
padding: 0 30rpx; padding: 0 30rpx;
} }
.right-text{

.right-text {
float: right; float: right;
} }

.restNum { .restNum {
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
@@ -393,12 +443,31 @@ button::after{ border: none; }
text-align: right; text-align: right;
} }


.time {
.timeX {
display: block;
font-size: 24rpx; font-size: 24rpx;
color: #333; color: #333;
letter-spacing: 0; letter-spacing: 0;
line-height: 33rpx; line-height: 33rpx;
}

#noBuy {
height: 94rpx;
width: 490rpx;
margin: 0 auto 30rpx;
color: #fff;
font-size: 36rpx;
line-height: 94rpx;
border-radius: 61rpx;
background-color: #25252533;
}

.time {
display: inline-block; display: inline-block;
font-size: 24rpx;
color: #333;
letter-spacing: 0;
line-height: 33rpx;
} }


.txt01 { .txt01 {
@@ -428,27 +497,30 @@ button::after{ border: none; }
font-weight: bold; font-weight: bold;
background: #ff4949; background: #ff4949;
} }

.fenxiang { .fenxiang {
position:absolute;
right:0;
top:-55rpx;
width:108rpx;
z-index:10;
position: absolute;
right: 0;
top: -55rpx;
width: 108rpx;
z-index: 10;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }


.fenxiang image { .fenxiang image {
width:48rpx;
width: 48rpx;
height: 48rpx; height: 48rpx;
z-index: 10; z-index: 10;
margin: 0 auto; margin: 0 auto;
} }
.gift{

.gift {
color: #3C3C3C; color: #3C3C3C;
font-size: 20rpx; font-size: 20rpx;
margin: 0 auto; margin: 0 auto;
} }

.user-motto { .user-motto {
width: 270rpx; width: 270rpx;
border: 0; border: 0;
@@ -457,6 +529,7 @@ button::after{ border: none; }
color: #fff; color: #fff;
position: fixed; position: fixed;
} }

.user-motto::after { .user-motto::after {
border: none; border: none;
} }
@@ -545,80 +618,84 @@ button::after{ border: none; }
width: 100%; width: 100%;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.poster{

.poster {
width: 100%; width: 100%;
height: 100%;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
height: 100%;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
} }

.bottomsave { .bottomsave {
width: 100%;
height: 140rpx;
line-height: 140rpx;
margin: auto 0;
bottom:0;
left: 0;
right: 0;
border-top: 1px solid #ccc;
box-shadow: 0 0rpx 150rpx #ccc;
background: #fff;
width: 100%;
height: 140rpx;
line-height: 140rpx;
margin: auto 0;
bottom: 0;
left: 0;
right: 0;
border-top: 1px solid #ccc;
box-shadow: 0 0rpx 150rpx #ccc;
background: #fff;
} }

.saveposter { .saveposter {
color: #fff;
width: 380rpx;
height: 80rpx;
border-radius: 50rpx;
background: #f08f04;
margin-top: 30rpx;
font-size: 32rpx;
color: #fff;
width: 380rpx;
height: 80rpx;
border-radius: 50rpx;
background: #f08f04;
margin-top: 30rpx;
font-size: 32rpx;
} }

.modal { .modal {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
overflow: hidden;
z-index: 10000;
color: #fff;
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
overflow: hidden;
z-index: 10000;
color: #fff;
} }


.modal-content { .modal-content {
width: 540rpx;
height: 233rpx;
line-height: 60rpx;
overflow: hidden;
position: fixed;
top: 50%;
left: 0;
z-index: 11;
background: #f9f9f9;
margin: -130rpx 105rpx;
border-radius: 36rpx;
display: flex;
width: 540rpx;
height: 233rpx;
line-height: 60rpx;
overflow: hidden;
position: fixed;
top: 50%;
left: 0;
z-index: 11;
background: #f9f9f9;
margin: -130rpx 105rpx;
border-radius: 36rpx;
display: flex;
} }


.modal-content view { .modal-content view {
display: inline-block;
flex: 1;
text-align: center;
display: inline-block;
flex: 1;
text-align: center;
} }


.modal-content view>text { .modal-content view>text {
color: #000;
display: block;
font-size: 30rpx;
height: 80rpx;
line-height: 80rpx;
color: #000;
display: block;
font-size: 30rpx;
height: 80rpx;
line-height: 80rpx;
} }


.modal-content view>image { .modal-content view>image {
margin-top: 30rpx;
width: 90rpx;
height: 90rpx;
margin-top: 30rpx;
width: 90rpx;
height: 90rpx;
} }


.b1 .con { .b1 .con {
@@ -674,7 +751,7 @@ height: 90rpx;
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
} }


.b1 .quessss >view:last-child {
.b1 .quessss>view:last-child {
border-bottom: 0; border-bottom: 0;
} }


@@ -740,7 +817,8 @@ height: 90rpx;
background: #fff; background: #fff;
} }


.b1 .btns .fr,.btns .fl {
.b1 .btns .fr,
.btns .fl {
width: 277rpx; width: 277rpx;
height: 95rpx; height: 95rpx;
border-radius: 48rpx; border-radius: 48rpx;
@@ -896,7 +974,8 @@ height: 90rpx;
text-overflow: ellipsis; text-overflow: ellipsis;
} }


.b1 checkbox-group, radio-group {
.b1 checkbox-group,
radio-group {
height: 400rpx; height: 400rpx;
overflow-y: scroll; overflow-y: scroll;
} }
@@ -911,6 +990,7 @@ height: 90rpx;
width: 100%; width: 100%;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }

.b1 .content { .b1 .content {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -919,26 +999,29 @@ height: 90rpx;
background: #f3f3f3; background: #f3f3f3;
position: relative; position: relative;
} }
.b1 .poster{
width: 100%;

.b1 .poster {
width: 100%;
height: 100%; height: 100%;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
padding: 20rpx;
position: absolute;
top: 0;
left: 0;
} }

.b1 .bottomsave { .b1 .bottomsave {
width: 100%; width: 100%;
height: 140rpx; height: 140rpx;
line-height: 140rpx; line-height: 140rpx;
margin: auto 0; margin: auto 0;
bottom:0;
bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
box-shadow: 0 0rpx 150rpx #ccc; box-shadow: 0 0rpx 150rpx #ccc;
background: #fff; background: #fff;
} }

.b1 .saveposter { .b1 .saveposter {
color: #fff; color: #fff;
width: 380rpx; width: 380rpx;
@@ -948,6 +1031,7 @@ height: 90rpx;
margin-top: 30rpx; margin-top: 30rpx;
font-size: 32rpx; font-size: 32rpx;
} }

.b1 .modal { .b1 .modal {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -992,37 +1076,44 @@ height: 90rpx;
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
} }
.b1 .wx-swiper-dots{

.b1 .wx-swiper-dots {
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.quan{

.quan {
float: left; float: left;
margin:28rpx 15rpx 0 0;
margin: 28rpx 15rpx 0 0;
width: 12rpx; width: 12rpx;
height: 12rpx; height: 12rpx;
background: #E1E1E1; background: #E1E1E1;
border-radius: 50%; border-radius: 50%;
} }
.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal{
margin-bottom: 2rpx;

.swiper-box .wx-swiper-dots.wx-swiper-dots-horizontal {
margin-bottom: 2rpx;
} }
.swiper-box .wx-swiper-dot{
width:40rpx;
display: inline-flex;
height: 6rpx;
margin-left: 10rpx;
border-radius:6rpx;
justify-content:space-between;

.swiper-box .wx-swiper-dot {
width: 40rpx;
display: inline-flex;
height: 6rpx;
margin-left: 10rpx;
border-radius: 6rpx;
justify-content: space-between;
} }
.swiper-box .wx-swiper-dot::before{
content: '';
flex-grow: 1;
background: #ccc8c8;

.swiper-box .wx-swiper-dot::before {
content: '';
flex-grow: 1;
background: #ccc8c8;
} }
.swiper-box .wx-swiper-dot-active::before{
background:#f6792b;

.swiper-box .wx-swiper-dot-active::before {
background: #f6792b;
} }
.yj{

.yj {
text-decoration: line-through; text-decoration: line-through;
color: #CCC; color: #CCC;
font-size: 26rpx; font-size: 26rpx;


+ 1
- 1
project.config.json 查看文件

@@ -35,7 +35,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.11.2", "libVersion": "2.11.2",
"appid": "wx453ae0d37f3550d0",
"appid": "wxfa336cad86ed598d",
"projectname": "C", "projectname": "C",
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},


Loading…
取消
儲存