diff --git a/app.json b/app.json
index 4e8ab1c..ca01d16 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,8 @@
{
"pages": [
"pages/index/index",
+ "pages/bargain/bargainDatail/bargainDatail",
+ "pages/bargain/bargain",
"pages/cardorder/index/index",
"pages/scanPay/scanPay",
"pages/edit/edit",
@@ -49,6 +51,11 @@
"wx192b7d2e8dcbefd0",
"wxc07f9d67923d676d"
],
+ "permission": {
+ "scope.userLocation": {
+ "desc": "你的位置信息将用于小程序位置接口的效果展示"
+ }
+ },
"tabBar": {
"color": "#9F9F9F",
"selectedColor": "#00C0FF",
diff --git a/assets/images/bargaincancel.png b/assets/images/bargaincancel.png
new file mode 100644
index 0000000..19e5d9c
Binary files /dev/null and b/assets/images/bargaincancel.png differ
diff --git a/assets/images/bargainfail.png b/assets/images/bargainfail.png
new file mode 100644
index 0000000..b0e122b
Binary files /dev/null and b/assets/images/bargainfail.png differ
diff --git a/assets/images/bargainsuccess.png b/assets/images/bargainsuccess.png
new file mode 100644
index 0000000..94f0e11
Binary files /dev/null and b/assets/images/bargainsuccess.png differ
diff --git a/assets/images/discount.png b/assets/images/discount.png
new file mode 100644
index 0000000..c3eb583
Binary files /dev/null and b/assets/images/discount.png differ
diff --git a/assets/images/goodsimg.png b/assets/images/goodsimg.png
new file mode 100644
index 0000000..2cbf60d
Binary files /dev/null and b/assets/images/goodsimg.png differ
diff --git a/assets/images/icon004.png b/assets/images/icon004.png
new file mode 100644
index 0000000..977130f
Binary files /dev/null and b/assets/images/icon004.png differ
diff --git a/assets/images/icon01 (4).png b/assets/images/icon01 (4).png
deleted file mode 100644
index 1e68e84..0000000
Binary files a/assets/images/icon01 (4).png and /dev/null differ
diff --git a/assets/images/success01.png b/assets/images/success01.png
new file mode 100644
index 0000000..f48b052
Binary files /dev/null and b/assets/images/success01.png differ
diff --git a/config/config.js b/config/config.js
index 471ef0a..35b78c5 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,11 +1,12 @@
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
var appId = extConfig.appId;
var config = {
- // url: "https://ciformall.youlane.cn/C/api",
- url:"https://c.malls.iformall.com/C/api",
+ url: "https://ciformall.youlane.cn/C/api",
+ // url:"https://c.malls.iformall.com/C/api",
// url:'https://ctest.malls.iformall.com/C/api',
- // url:'http://10.100.33.68:7000/C/api',
+ // url:'http://10.100.30.173:7000/C/api',
// url: 'http://202.165.179.86:4000/C/api',
+ //
api: {
/**
* 接口用途:login
@@ -191,7 +192,7 @@ var config = {
/**
* 获取用户折扣率
*/
- getDiscount:"/user/getDiscount",
+ getDiscountInfo:"/user/getDiscountInfo",
/**
* C端扫B端储值卡交易流水列表接口
*/
@@ -199,11 +200,27 @@ var config = {
/**
* 根据code查询接口
*/
- findByCode:"/merchant/findByCode"
+ findByCode:"/merchant/findByCode",
+ /**
+ * 参与砍价
+ */
+ pressOrderJoin:"/press/pressOrderJoin",
+ /**
+ * 我的砍价列表
+ */
+ pressOrderList:"/order/pressOrderList",
+ /**
+ * 砍价订单详情
+ */
+ pressOrderDetail:"/order/pressOrderDetail",
+ /**
+ *
+ */
+ getPressOrderStatus:"/press/getPressOrderStatus"
},
weapp: {
- AppId: "wx30caec1cc16c4634"
+ AppId: "wxea71200db93d756b"
},
ErrorCode: {
diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js
new file mode 100644
index 0000000..2de09d0
--- /dev/null
+++ b/pages/bargain/bargain.js
@@ -0,0 +1,253 @@
+var config = require("../../config/config.js");
+const Http = require("../../utils/HttpBasics");
+const imgurl = require("../../utils/imgurl");
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ bannerUrl: imgurl.banner.url,
+ loadingUrl: imgurl.loading.url,
+ bargaingoods: true,
+ mybargain: false,
+ list: [],
+ lists: [],
+ page: 1, // 设置加载的第几次,默认是第一次
+ pageSize: 10, //返回数据的个数
+ searchLoadingComplete: false, //“没有数据”的变量,默认false,隐藏
+ allow_load: true, // 是否允许继续加载标识 默认 true 允许,false 加载完成
+ myorder: false,
+ actUrl: imgurl.act.url,
+ loadingUrl: imgurl.loading.url,
+ flag: null,
+ },
+ onShow: function () {
+ let that = this;
+ that.getBannerlist();
+ var todayDate=new Date().getTime();
+ that.setData({
+ todayDate:todayDate
+ })
+ let myDiscount = wx.getStorageSync('myDiscount');
+ console.log(myDiscount)
+ if (myDiscount == 'myDiscount') {
+ wx.setStorageSync('myDiscount', "dismyDiscount")
+ that.getList(1, "mybargain");
+ that.setData({
+ flag: "mybargain"
+ })
+ } else {
+ wx.setStorageSync('myDiscount', "dismyDiscount")
+ that.getList(1, "bargaingoods");
+ that.setData({
+ flag: "bargaingoods"
+ })
+ }
+ },
+ /**
+ * banner
+ */
+ getBannerlist: function () {
+ let that = this;
+ Http.get({
+ url: config.api.bannerlist,
+ data: {
+ pageNum: 1,
+ pageSize: 7
+ }
+ }).then(res => {
+ that.setData({
+ list: res.data.list
+ });
+ });
+ },
+ getList(pageNum, flag) {
+ var that = this;
+ if (that.data.allow_load) {
+ /**
+ * mybargain: 我的砍价
+ * bargaingoods: 砍价商品
+ */
+ that.setData({
+ loading: true,
+ content: '小主,我在玩命加载中...'
+ })
+ var param = {};
+ if (flag == 'mybargain') {
+ that.setData({
+ flag: "mybargain"
+ })
+ var param = {
+ pageNum: pageNum,
+ pageSize: 6
+ };
+ var url = config.api.pressOrderList;
+ } else if (flag == 'bargaingoods') {
+ that.setData({
+ flag: "bargaingoods"
+ })
+ var param = {
+ pageNum: pageNum,
+ pageSize: 6,
+ targetAd: 6
+ };
+ var url = config.api.couponChannelList;
+ }
+ // 请求接口
+ Http.get({
+ url: url,
+ data: param
+ }).then(res => {
+ console.log(res)
+ /**
+ * 加载完成
+ */
+ if (pageNum >= res.data.pages) {
+ if (res.data.pages == 0 || res.data.pages == 1) {
+ that.setData({
+ allow_load: true,
+ loading: false,
+ content: ""
+ });
+ } else {
+ that.setData({
+ allow_load: false,
+ loading: true,
+ content: "——— 再拉裤子就掉了啦 ———",
+ });
+ }
+ }
+ if (pageNum == 1) {
+ that.setData({
+ lists: [],
+ })
+ }
+ var tmpArr = that.data.lists;
+ tmpArr.push.apply(tmpArr, res.data.list);
+ that.setData({
+ lists: tmpArr
+ })
+ })
+ .catch(err => {
+ wx.showToast({
+ title: err.errMsg,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ })
+ setTimeout(function () {
+ that.setData({
+ loading: false,
+ })
+ }, 1400);
+ } else {
+ that.setData({
+ loading: true,
+ content: "——— 再拉裤子就掉了啦 ———"
+ })
+ setTimeout(function () {
+ that.setData({
+ loading: false,
+ })
+ }, 1400)
+ }
+ },
+ /**
+ * 如果是重新砍价,需要重新下单
+ */
+ orderSave: function (couponId,orderId,couponChannelId) {
+ Http.post({
+ url: config.api.orderSave,
+ data: {
+ couponId: "" + couponId,
+ couponChannelId:""+couponChannelId,
+ press: true
+ }
+ })
+ .then(res => {
+ console.log(res)
+ wx.navigateTo({
+ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${orderId}`
+ })
+ })
+ .catch(err => {
+ wx.showToast({
+ title: err.message,
+ icon: "none"
+ })
+ })
+ },
+ inviteFriend: function (e) {
+ /**
+ * 添加标识
+ */
+ wx.navigateTo({
+ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${e.currentTarget.dataset.id}`
+ })
+ },
+ barginAgain: function (e) {
+ let that = this;
+ console.log(e)
+ let couponId = e.currentTarget.dataset.couponid;
+ let couponChannelId = e.currentTarget.dataset.couponchannelid;
+ let orderId = e.currentTarget.dataset.id;
+ that.orderSave(couponId,orderId,couponChannelId)
+ },
+ mybargain: function () {
+ let that = this;
+ that.setData({
+ bargaingoods: false,
+ mybargain: true,
+ flag: "mybargain",
+ allow_load: true,
+ loading: false,
+ content: ""
+ })
+ that.getList(1, 'mybargain');
+ wx.setNavigationBarTitle({
+ title: '我的砍价'
+ })
+ },
+ bargaingoods: function () {
+ let that = this;
+ that.setData({
+ bargaingoods: true,
+ mybargain: false,
+ flag: "bargaingoods",
+ allow_load: true,
+ loading: false,
+ content: ""
+ })
+
+ that.getList(1, 'bargaingoods');
+ wx.setNavigationBarTitle({
+ title: '砍价专场'
+ })
+ },
+ /**
+ *
+ * @param {砍价} 邀请好友砍价
+ */
+ invite: function (e) {
+ console.log(e.currentTarget.dataset.id);
+ let couponChannelId = e.currentTarget.dataset.id;
+ let couponId = e.currentTarget.dataset.couponid;
+ if (couponChannelId && couponId) {
+ wx.navigateTo({
+ url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}`
+ })
+ }
+ },
+ //加载更多
+ onReachBottom: function () {
+ let that = this;
+ that.data.page++;
+ that.setData({
+ page: that.data.page
+ });
+ that.getList(that.data.page, that.data.flag);
+ },
+})
\ No newline at end of file
diff --git a/pages/bargain/bargain.json b/pages/bargain/bargain.json
new file mode 100644
index 0000000..8cd1569
--- /dev/null
+++ b/pages/bargain/bargain.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "砍价专场",
+ "usingComponents": {
+ "c-banner": "../../components/banner/index",
+ "i-tab": "../../../dist/tab/index",
+ "i-tabs": "../../../dist/tabs/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml
new file mode 100644
index 0000000..2a8b892
--- /dev/null
+++ b/pages/bargain/bargain.wxml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.subTitle}}
+ {{item.priceStr}}元
+ 可砍至{{item.salePriceStr}}元
+
+ 发起砍价
+
+
+
+ 请您敬请期待
+ 我们正在筹备一大波优惠活动
+
+ {{content}}
+ {{loadingtext}}
+
+
+
+
+
+
+ {{item.title}}
+ {{item.subTitle}}
+ 距砍价到{{item.salePrice/100}}元还差:{{item.pressCurrentValue/100}}元
+ 已砍价到底价:{{item.salePrice/100}}元
+
+ 邀请好友砍价
+ 重新砍价
+
+ 立即支付
+
+
+
+ 重新砍价
+
+
+
+
+
+
+
+
+
+ 请您敬请期待
+ 我们正在筹备一大波优惠活动
+
+ {{content}}
+ {{loadingtext}}
+
+
+ 砍价商品
+ 我的砍价
+
+
\ No newline at end of file
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
new file mode 100644
index 0000000..af6b54d
--- /dev/null
+++ b/pages/bargain/bargain.wxss
@@ -0,0 +1,407 @@
+page{
+ height: auto!important;
+}
+.banner .bg {
+ display: block;
+ width: 100%;
+}
+
+.bannerimg {
+ display: block;
+ width: 710rpx;
+ height: 260rpx;
+ border-radius: 15rpx;
+ margin: -120rpx auto 0;
+}
+.list{
+ padding: 0 32rpx;
+}
+.listitem .fl {
+ width: 200rpx;
+ height: 180rpx!important;
+ border-radius: 10rpx;
+ overflow: hidden;
+}
+.listitem .icon{
+ width: 140rpx;
+ height: 116rpx;
+ position: absolute;
+ top: 12rpx;
+ right: 0;
+}
+.listitem .ri {
+ margin-left: 26rpx;
+ width: 305rpx;
+}
+.ri text{
+ display: block;
+ text-align: left;
+}
+.ri .txt01 {
+ width: 100%;
+ font-size:30rpx;
+ color: rgba(51, 51, 51, 1);
+ line-height: 44rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-weight: bold;
+}
+
+.ri .txt02 {
+ width: 100%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-size: 24rpx;
+ color: rgba(140, 140, 140, 1);
+}
+.ri .txt03 {
+ width: 100%;
+ font-size:24rpx;
+ text-decoration:line-through;
+ color:rgba(140,140,140,1);
+}
+.ri .txt04 {
+ width: 100%;
+ color:#FF3232;
+ font-size:24rpx;
+ color:rgba(255,50,50,1);
+ line-height:44rpx;
+}
+.money{
+ display: inline-block!important;
+ font-size:50rpx;
+ font-weight:500;
+ color:rgba(255,50,50,1);
+}
+.listitem{
+ position: relative;
+ padding: 31rpx 0;
+ border-bottom: 1rpx solid #F9F9F9;
+}
+.botton{
+ position: absolute;
+ right: 0;
+ text-align: center;
+ bottom: 40rpx;
+ width:186rpx;
+ height:48rpx;
+ line-height:48rpx;
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ border-radius:24rpx;
+ font-size:26rpx;
+ color:rgba(255,255,255,1);
+}
+.botton1{
+ position: absolute;
+ right: 0;
+ text-align: center;
+ bottom: 31rpx;
+ width:186rpx;
+ height:48rpx;
+ line-height:48rpx;
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ border-radius:24rpx;
+ font-size:26rpx;
+ color:rgba(255,255,255,1);
+}
+.botton2{
+ position: absolute;
+ right: 0;
+ text-align: center;
+ bottom: 31rpx;
+ border-radius:24rpx;
+ font-size:26rpx;
+ line-height:48rpx;
+ color:rgba(255,255,255,1);
+ width:134rpx;
+ height:48rpx;
+ background:linear-gradient(90deg,rgba(117,158,69,1) 0%,rgba(138,183,79,1) 100%);
+}
+.botton3{
+ position: absolute;
+ right: 0;
+ text-align: center;
+ bottom: 31rpx;
+ line-height:48rpx;
+ border-radius:24rpx;
+ font-size:26rpx;
+ color:rgba(255,255,255,1);
+ width:134rpx;
+ height:48rpx;
+ background:linear-gradient(90deg,rgba(255,145,2,1) 0%,rgba(255,176,22,1) 100%);
+}
+.buttonfix{
+ position: fixed;
+ height: 95rpx;
+ line-height: 95rpx;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: flex;
+ flex: 2;
+ background: #fff;
+ border-top:1rpx solid #C6C6C6;
+ justify-content: space-around;
+ text-align: center;
+}
+.buttonfix > view{
+ text-align: center;
+ font-size: 32rpx;
+ flex: 1;
+}
+.active1{
+ color: #02C0FF!important;
+}
+.line{
+ border-left:1rpx solid #C6C6C6;
+ box-sizing:border-box;
+ -moz-box-sizing:border-box;
+ -webkit-box-sizing:border-box;
+}
+.page{
+ padding-bottom: 100rpx;
+}
+.mr{
+ margin-top: 60rpx;
+}
+.market {
+ width: 100%;
+ height: 100%;
+ /* background: #f5f5f5; */
+ }
+
+ .tabs {
+ width: 100% !important;
+ height: 88rpx;
+ text-align: center;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 100000;
+ }
+
+ .i-tab {
+ width: 25% !important;
+ display: inline-block;
+ }
+
+ .section {
+ position: relative;
+ }
+
+ .mms {
+ position: relative;
+ width: 690rpx;
+ height: 197rpx !important;
+ background: #fff;
+ padding: 30rpx 0 0;
+ margin: 0 auto 40rpx;
+ border-radius: 16rpx;
+ border-top: 8rpx solid #02b7ff;
+ box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
+ }
+
+ .detail_msg {
+ display: flex;
+ padding-bottom: 26rpx;
+ }
+
+ .expiretime {
+ display: block;
+ width: 100%;
+ text-align: left;
+ text-indent: 1em;
+ height:54rpx;
+ line-height:54rpx;
+ font-size: 26rpx;
+ color: #333;
+ letter-spacing: 0;
+ }
+
+ .liness {
+ display: block;
+ width: 100%;
+ }
+
+ .logo {
+ width: 60rpx;
+ height: 60rpx;
+ border: 1px solid #f8f8f8;
+ border-radius: 50rpx;
+ display: block;
+ margin-left: 20rpx;
+ }
+
+ .logo image {
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 50%;
+ }
+
+ .info view:nth-child(1) {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 2%;
+ }
+
+ .info {
+ width: 100%;
+ }
+
+ .info view:nth-child(1) text {
+ font-size: 32rpx;
+ line-height: 32rpx;
+ height: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+ width: 400rpx;
+ display: inline-block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
+ .info view:nth-child(2) {
+ padding-left: 2%;
+ font-size: 22rpx;
+ color: #333;
+ letter-spacing: 0;
+ margin-top: 6rpx;
+ display: inline-block;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ width: 400rpx;
+ }
+
+ .info view:nth-child(3) {
+ margin-left: 20rpx;
+ }
+
+ .btns {
+ position: absolute;
+ right: 30rpx;
+ top: 38rpx;
+ width: 120rpx;
+ height: 48rpx;
+ line-height: 48rpx;
+ text-align: center;
+ border: 2rpx solid #02c0ff;
+ border-radius: 60rpx;
+ color: #02c0ff;
+ font-size: 28rpx;
+ }
+
+ .active {
+ color: #fff;
+ background: #02c0ff;
+ }
+
+ .txt1 {
+ font-size: 26rpx;
+ color: #333;
+ letter-spacing: 0;
+ }
+
+ .nocoupon image {
+ width: 300rpx;
+ display: block;
+ margin: 3% auto 0;
+ }
+
+ .txt001 {
+ display: block;
+ line-height: 48rpx;
+ font-size: 34rpx;
+ color: #333;
+ letter-spacing: 0;
+ text-align: center;
+ }
+
+ .txt002 {
+ display: block;
+ margin-top: 1%;
+ font-size: 28rpx;
+ color: #999;
+ letter-spacing: 0;
+ line-height: 40rpx;
+ text-align: center;
+ }
+
+ .nocoupon button {
+ background: #00c0ff;
+ color: #fff;
+ font-style: 30rpx;
+ width: 100%;
+ border-radius: 60rpx;
+ }
+
+ .loading {
+ text-align: center;
+ height: 80rpx;
+ line-height: 80rpx;
+ font-size: 26rpx;
+ color: #999;
+ }
+
+ .loading image {
+ width: 60rpx;
+ height: 60rpx;
+ vertical-align: middle;
+ margin-right: 10rpx;
+ }
+
+ .active {
+ opacity: 0.6;
+ }
+
+ .nav {
+ position: absolute;
+ bottom: 3.3%;
+ left: 0;
+ right: 0;
+ margin: auto;
+ width: 670rpx;
+ border-radius: 60rpx;
+ background: #02c0ff;
+ font-size: 32px;
+ color: #fff;
+ text-align: center;
+ line-height: 32px;
+ }
+ .sendImg{
+ position: absolute;
+ width: 100rpx;
+ top:109rpx;
+ right:72rpx;
+ }
+
+.dingdan {
+ margin-top: 33rpx;
+ }
+
+ .dingdan text:nth-of-type(1) {
+ display: block;
+ font-size: 34rpx;
+ color: #333;
+ letter-spacing: 0;
+ text-align: center;
+ }
+
+ .dingdan text:nth-of-type(2) {
+ display: block;
+ font-size: 28rpx;
+ color: #999;
+ letter-spacing: 0;
+ text-align: center;
+ }
+
+ .dingdan image {
+ display: block;
+ width: 300rpx;
+ height: 300rpx;
+ margin: 0 auto 16rpx;
+ }
\ No newline at end of file
diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js
new file mode 100644
index 0000000..112487f
--- /dev/null
+++ b/pages/bargain/bargainDatail/bargainDatail.js
@@ -0,0 +1,503 @@
+var config = require("../../../config/config.js");
+var app = getApp();
+const Http = require("../../../utils/HttpBasics");
+const util = require("../../../utils/util");
+const imgurl = require("../../../utils/imgurl");
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ bannerUrl: imgurl.banner.url,
+ data: null,
+ from: null,
+ hour: null,
+ min: null,
+ sec: null,
+ showPage: false,
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ let that = this;
+ console.log(options)
+ if (options.orderId || options.orderId && options.from == 'discount') {
+ if (options.from) {
+ that.setData({
+ orderId: options.orderId,
+ from: "discount"
+ })
+ } else {
+ that.setData({
+ orderId: options.orderId
+ })
+ }
+ that.pressOrderDetail(options.orderId);
+ // that.getPressOrderStatus(options.orderId)
+ }
+ },
+ /**
+ * 更多砍价商品
+ */
+ gotomore: function() {
+ wx.navigateTo({
+ url: '/pages/bargain/bargain',
+ })
+ },
+ /**
+ * @param {砍价状态(1:我发起的砍价,2:未参与的砍价, 3:已参与的砍价)} orderId
+ */
+ getPressOrderStatus: function(orderId) {
+ let that = this;
+ Http.post({
+ url: config.api.getPressOrderStatus,
+ data: {
+ orderId: orderId
+ }
+ })
+ .then(res => {
+ if (res.data.status == 1) {
+ that.setData({
+ discountStatus: 1
+ })
+ } else if (res.data.status == 2) {
+ that.setData({
+ discountStatus: 2
+ })
+ } else if (res.data.status == 3) {
+ that.setData({
+ discountStatus: 3
+ })
+ }
+ wx.stopPullDownRefresh();
+ })
+ .catch(err => {
+ wx.stopPullDownRefresh();
+ wx.showToast({
+ title: err.message,
+ icon: "none"
+ })
+ })
+ },
+ helpDiscount: function() {
+ let that = this;
+ that.pressOrderJoin(that.data.orderId);
+ },
+ //参与砍价
+ pressOrderJoin: function(orderId) {
+ let that = this;
+ Http.post({
+ url: config.api.pressOrderJoin,
+ data: {
+ orderId: orderId
+ }
+ })
+ .then(res => {
+ console.log(res);
+ // id 是订单号
+ that.pressOrderDetail(orderId);
+ })
+ .catch(err => {
+ console.log(err)
+ wx.showToast({
+ title: err.message,
+ icon: "none"
+ })
+ })
+ },
+ // 订单详情
+ pressOrderDetail: function(orderId) {
+ let that = this;
+ Http.get({
+ url: config.api.pressOrderDetail,
+ data: {
+ orderId: orderId
+ }
+ })
+ .then(res => {
+ console.log(res);
+ that.getPressOrderStatus(orderId);
+ res.data.orderPressList.map(file => {
+ file.createDate = diffTime(file.createDate)
+ })
+ that.countdown(res.data.pressEndDate);
+ that.setData({
+ data: res.data,
+ already: (res.data.price / 100 - res.data.salePrice / 100 - res.data.pressCurrentValue / 100).toFixed(2),
+ remain: (res.data.pressCurrentValue / 100).toFixed(2),
+ showPage: true
+ })
+ })
+ .catch(err => {
+ wx.showToast({
+ title: err.message,
+ icon: "none"
+ })
+ wx.stopPullDownRefresh();
+ })
+ },
+ onShow: function() {
+ let that = this;
+ wx.setStorageSync('myDiscount', "myDiscount");
+ var todayDate = new Date().getTime();
+ that.setData({
+ todayDate: todayDate,
+ })
+ },
+ countdown(end_time) {
+ let that = this;
+ var EndTime = end_time;
+ var NowTime = new Date().getTime();
+ var total_micro_second = EndTime - NowTime || [];
+ // 渲染倒计时时钟
+ let obj = that.dateformat(total_micro_second);
+ if (total_micro_second > 0) {
+ that.setData({
+ clock: obj,
+ day: obj.a1,
+ hour: obj.b1,
+ min: obj.c1,
+ sec: obj.d1,
+ })
+ } else {
+ that.setData({
+ clock: "00",
+ day: "00",
+ hour: "00",
+ min: "00",
+ sec: "00",
+ })
+ }
+ setTimeout(function() {
+ total_micro_second -= 1000;
+ that.countdown(end_time);
+ }, 1000)
+ },
+
+ // 时间格式化输出,如11:03 25:19 每1s都会调用一次
+ dateformat(micro_second) {
+ // 总秒数
+ var second = Math.floor(micro_second / 1000);
+ // 天数
+ var day = Math.floor(second / 3600 / 24) < 10 ? "0" + Math.floor(second / 3600 / 24) : Math.floor(second / 3600 / 24);
+ // 小时
+ var hr = Math.floor(second / 3600 % 24) < 10 ? "0" + Math.floor(second / 3600 % 24) : Math.floor(second / 3600 % 24);
+ // 分钟
+ var min = Math.floor(second / 60 % 60) < 10 ? "0" + Math.floor(second / 60 % 60) : Math.floor(second / 60 % 60);
+ // 秒
+ var sec = Math.floor(second % 60) < 10 ? "0" + Math.floor(second % 60) : Math.floor(second % 60);
+
+ // return day + "天" + hr + "小时" + min + "分钟" + sec + "秒";
+ return {
+ a1: day,
+ b1: hr,
+ c1: min,
+ d1: sec
+ }
+ },
+ payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => {
+ let that = this;
+ // 支付成功
+ Http.post({
+ url: config.api.payOrderUpdate,
+ data: {
+ payOrderId: payOrderId,
+ orderId: orderId,
+ status: status,
+ reason: reason
+ }
+ })
+ .then(res => {
+ wx.hideLoading()
+ // 有价券
+ if (!type && type != 'free') {
+ wx.navigateTo({
+ url: `/pages/order/detail/index?orderId=${
+ orderId
+ }`
+ });
+ } else if (type == 'free') {
+ wx.navigateTo({
+ url: `/pages/order/detail/index?orderId=${
+ orderId
+ }`
+ });
+ }
+ })
+ .catch(err => {
+ console.log(err);
+ if (!type) {
+ setTimeout(function() {
+ _this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this);
+ }, 2000)
+ }
+ })
+ },
+ /**
+ * 发起支付
+ */
+ orderFunc(e) {
+ var that = this;
+ console.log(e)
+ Http.post({
+ url: config.api.checkPhoneStatus,
+ data: {}
+ })
+ .then(res => {
+ if (typeof(res) != "undefined") {
+ let orderId = "" + e.currentTarget.dataset.orderid;
+ that.setData({
+ orderId: orderId
+ });
+ if (e.currentTarget.dataset.saleprice / 100 > 0 || e.currentTarget.dataset.price / 100 > 0) {
+ /**
+ * 支付订单创建
+ */
+ Http.post({
+ url: config.api.payOrderCreate,
+ data: {
+ orderId: orderId
+ }
+ })
+ .then(res => {
+ var payOrderId = "" + res.data.payOrderId;
+ wx.hideLoading();
+ wx.requestPayment({
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.package,
+ signType: (res.data.signType) ? res.data.signType : "MD5",
+ paySign: res.data.paySign,
+ success: res => {
+ wx.showLoading({
+ title: '订单正在处理中...',
+ })
+ setTimeout(function() {
+ wx.hideLoading()
+ }, 5000)
+ that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that);
+ if (res.errMsg == "requestPayment:ok") {
+ setTimeout(function() {
+ wx.hideLoading();
+ }, 2000);
+ /**
+ * 用户支付成功以后跳转到券包列表
+ */
+ if (that.data.cardType == 7) {
+ wx.setStorage({
+ key: 'couponNum2',
+ data: "couponNum2"
+ })
+ } else {
+ wx.setStorage({
+ key: 'couponNum',
+ data: "couponNum"
+ })
+ }
+ }
+ },
+ fail: res => {
+ /**
+ * 支付失败,需要更新订单的状态
+ */
+ that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', 'fail', that);
+ that.setData({
+ showbutton: false
+ })
+ return;
+ },
+ complete: res => {}
+ });
+ /// End payment --------
+ })
+ .catch(err => {
+ console.log(err);
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ })
+ } else {
+ // 免费券
+ that.payOrderUpdate(orderId, "0", 1, '', 'free');
+ if (that.data.cardType == 7) {
+ wx.setStorage({
+ key: 'couponNum2',
+ data: "couponNum2"
+ })
+ } else {
+ wx.setStorage({
+ key: 'couponNum',
+ data: "couponNum"
+ })
+ }
+ }
+ }
+ })
+ .catch(err => {
+ if (err.code == 2011) {
+ wx.showToast({
+ title: "商户信息没找到",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 2013) {
+ wx.showToast({
+ title: "商户信息禁用",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3000) {
+ wx.showToast({
+ title: "库存不足",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3001) {
+ wx.showToast({
+ title: "领取达到上限",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3002) {
+ wx.showToast({
+ title: "订单失败",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3003) {
+ wx.showToast({
+ title: "订单不存在",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3004) {
+ wx.showToast({
+ title: "订单不存在",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 4003) {
+ wx.showToast({
+ title: "卡券已作废",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 11005) {
+ /**
+ * 将值传到用户手机号授权的页面
+ *
+ */
+ wx.redirectTo({
+ url: "/pages/getphoneInfo/index?couponChannelId=" +
+ that.data.couponChannelId +
+ "&couponId=" +
+ that.data.couponId
+ });
+ } else if (err.code == 11006) {
+ // 用户手机已加密
+ wx.redirectTo({
+ url: "/pages/phoneinput/phoneinput?couponChannelId=" +
+ that.data.couponChannelId +
+ "&couponId=" +
+ that.data.couponId
+ });
+ } else {
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ }
+ })
+ },
+ /**
+ *
+ * @param {朋友邀请砍价} e
+ */
+ barginAgain: function(e) {
+ let couponChannelId = e.currentTarget.dataset.couponchannelid;
+ let couponId = e.currentTarget.dataset.couponid;
+ wx.navigateTo({
+ url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}`,
+ })
+ },
+ /**
+ * 刷新
+ */
+ onPullDownRefresh: function (e) {
+ let that = this;
+ if (that.data.orderId || that.data.orderId && that.data.from == 'discount') {
+ if (that.data.from) {
+ that.setData({
+ orderId: that.data.orderId,
+ from: "discount"
+ })
+ } else {
+ that.setData({
+ orderId: that.data.orderId
+ })
+ }
+ that.pressOrderDetail(that.data.orderId);
+ }
+ },
+ onShareAppMessage: function(options) {
+ console.log(options)
+ var that = this;
+ console.log(that.data.data.id)
+ var shareObj = {
+ title: that.data.data.title,
+ path: `/pages/index/index?orderId=${that.data.data.id}&from=${"discount"}`,
+ success: function(res) {
+ if (res.errMsg == 'shareAppMessage:ok') {}
+ },
+ fail: function(error) {
+ if (res.errMsg == 'shareAppMessage:fail cancel') {} else if (res.errMsg == 'shareAppMessage:fail') {}
+ }
+ };
+ // 来自页面内的按钮的转发
+ if (options.from == 'button') {
+ var orderId = options.target.dataset.orderid;
+ shareObj.path = `/pages/index/index?orderId=${orderId}&from=${"discount"}`;
+ }
+ // 返回shareObj
+ return shareObj;
+ },
+})
+
+function diffTime(startDate) {
+ var diff = new Date().getTime() - startDate;
+ var days = Math.floor(diff / (24 * 3600 * 1000));
+ var leave1 = diff % (24 * 3600 * 1000);
+ var hours = Math.floor(leave1 / (3600 * 1000));
+ var leave2 = leave1 % (3600 * 1000);
+ var minutes = Math.floor(leave2 / (60 * 1000));
+ var leave3 = leave2 % (60 * 1000);
+ var seconds = Math.round(leave3 / 1000);
+
+ var returnStr = seconds + "秒";
+ if (minutes > 0) {
+ returnStr = minutes + "分" + returnStr;
+ }
+ if (hours > 0) {
+ returnStr = hours + "小时" + returnStr;
+ }
+ if (days > 0) {
+ returnStr = days + "天" + returnStr;
+ }
+ return returnStr;
+}
\ No newline at end of file
diff --git a/pages/bargain/bargainDatail/bargainDatail.json b/pages/bargain/bargainDatail/bargainDatail.json
new file mode 100644
index 0000000..75d9499
--- /dev/null
+++ b/pages/bargain/bargainDatail/bargainDatail.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "砍价详情",
+ "enablePullDownRefresh": true
+}
\ No newline at end of file
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml
new file mode 100644
index 0000000..7acde24
--- /dev/null
+++ b/pages/bargain/bargainDatail/bargainDatail.wxml
@@ -0,0 +1,63 @@
+
+
+
+
+ {{data.title}}
+ {{data.subTitle}}
+ {{data.price/100}}元
+ 可砍至{{data.salePrice/100}}元
+
+
+
+
+ 已砍 {{already}}元
+ 还剩 {{remain}}元
+
+
+
+ 还剩 {{hour}}:{{min}}:{{sec}} 结束
+
+
+
+ 好友的砍价已过期
+
+
+
+
+
+
+
+
+ 砍价成功
+
+
+
+
+
+
+
+
+
+
+ 发起人
+
+
+ {{item.nickName}}砍价成功!
+ 砍掉{{item.pressValue/100}}元
+ {{item.createDate}}前
+
+
+
+
+
+
+ {{data.price/100}}元
+ 立即购买
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss
new file mode 100644
index 0000000..2b01555
--- /dev/null
+++ b/pages/bargain/bargainDatail/bargainDatail.wxss
@@ -0,0 +1,300 @@
+.bargainDetail {
+ padding: 0 33rpx 0;
+}
+
+.listitem .fl {
+ width: 180rpx;
+ height: 180rpx;
+ border-radius:10rpx;
+}
+
+.listitem .icon {
+ width: 140rpx;
+ height: 116rpx;
+ position: absolute;
+ top: 12rpx;
+ right: 0;
+}
+
+.listitem .ri {
+ margin-left: 26rpx;
+ width: 305rpx;
+}
+
+.ri text {
+ display: block;
+ text-align: left;
+}
+
+.ri .txt01 {
+ width: 100%;
+ color: rgba(51, 51, 51, 1);
+ line-height: 44rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.ri .txt02 {
+ width: 100%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ font-size: 24rpx;
+ color: rgba(140, 140, 140, 1);
+}
+
+.ri .txt03 {
+ width: 100%;
+ font-size: 24rpx;
+ text-decoration: line-through;
+ color: rgba(140, 140, 140, 1);
+}
+
+.ri .txt04 {
+ width: 100%;
+ font-size: 24rpx;
+ color: rgba(255, 50, 50, 1);
+ line-height: 44rpx;
+}
+
+.money {
+ display: inline-block !important;
+ font-size: 50rpx;
+ font-weight: 500;
+ color: rgba(255, 50, 50, 1);
+}
+
+.listitem {
+ position: relative;
+ padding: 31rpx 0;
+}
+
+.progress {
+ width: 519rpx;
+ padding: 30rpx 84rpx 50rpx;
+ /* height: 136rpx; */
+ background: rgba(255, 245, 240, 1);
+ border-radius: 10rpx;
+ margin: 0 auto;
+}
+
+.progesstext {
+ margin-bottom: 13rpx;
+}
+
+.progesstext>text {
+ font-size: 24rpx;
+ color: rgba(51, 51, 51, 1);
+}
+
+.progesstext text text {
+ color: #FF3535;
+}
+
+.time {
+ margin-top: 20rpx;
+ font-size: 24rpx;
+ color: #333;
+ text-align:center;
+}
+
+.time text {
+ font-size: 30rpx;
+ color: #fff;
+ display: inline-block;
+ width: 40rpx;
+ text-align: center;
+ height: 40rpx;
+ line-height: 40rpx;
+ background: rgba(51, 51, 51, 1);
+ border-radius: 10rpx;
+}
+.head{
+ width:10%;
+ height: 90rpx;
+ position: relative;
+}
+.head image{
+ width: 70rpx;
+ border-radius:10rpx;
+}
+.head text{
+ width: 70rpx;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ font-size: 20rpx;
+ background: #ED3F2E;
+ color: #fff;
+ text-align: center;
+ border-radius: 20rpx;
+}
+.text{
+ width: 87%;
+ padding-left: 3%;
+ display: inline-block;
+ height: 90rpx;
+ line-height: 90rpx;
+ font-size: 26rpx;
+}
+.text01{
+ width: 220rpx;
+ margin-right: 6rpx;
+ overflow: hidden;
+}
+.text01 text{
+ width: 100rpx;
+ float: left;
+ height: 90rpx;
+ line-height: 90rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+.text02{
+ display: inline-block;
+ width: 140rpx;
+ overflow: hidden;
+}
+.text03{
+ width: 212rpx;
+ overflow: hidden;
+ text-align: right;
+ font-size:24rpx;
+}
+.person{
+ border-bottom: 1px solid #F9F9F9;
+ padding-bottom: 31rpx;
+ padding-top: 31rpx;
+}
+.text02 text:nth-of-type(2){
+ width: 80rpx;
+ overflow: hidden;
+ color: #FF3535;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ text-align: left;
+}
+.people{
+ margin-top: 20rpx;
+ padding-bottom: 130rpx;
+}
+.btns{
+ padding:33rpx;
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 100;
+ background: #fff;
+}
+.btns > view,.btns > button{
+ width: 330rpx;
+ height: 95rpx;
+ border-radius:48rpx;
+ text-align: center;
+}
+.btns .fl{
+ color: #fff;
+ background:rgba(255,169,2,1);
+ box-shadow:0px 8px 8px 1px rgba(255,169,2,0.32);
+}
+.btns .fl text{
+ display: block;
+ font-size: 30rpx;
+ line-height: 34rpx;
+}
+.btns .fl text:nth-of-type(1){
+ margin-top: 12rpx;
+}
+.btns .fr{
+ font-size: 30rpx;
+ color: #fff;
+ line-height: 95rpx;
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
+}
+.helpDiscount{
+ display: block;
+ width: 200rpx;
+ height: 200rpx;
+ border-radius:50%;
+ font-size: 24rpx;
+ text-align: center;
+ line-height: 200rpx;
+ margin-top: 30rpx;
+}
+.helpDiscount::after{ border: none; }
+.success{
+ margin-top: 50rpx;
+}
+.success image{
+ display: block;
+ width: 74rpx;
+ height: 74rpx;
+ margin: 0 auto;
+}
+.success text{
+ display: block;
+ text-align: center;
+ font-size:30rpx;
+ line-height: 30rpx;
+ color:rgba(51,51,51,1);
+}
+.btns01{
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: #fff;
+ padding: 30rpx 0;
+}
+.btns01 button{
+ color: #fff;
+ color:rgba(254,254,254,1);
+ width:650rpx;
+ height:85rpx;
+ line-height: 85rpx;
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
+ border-radius:43rpx;
+}
+.fail{
+ width:687rpx;
+ height:166rpx;
+ background:rgba(226,226,226,1);
+ border-radius:10rpx;
+ font-size:30rpx;
+ text-align: center;
+ line-height: 166rpx;
+ color:rgba(51,51,51,1);
+ margin: 20rpx auto 0;
+}
+.status{
+ width: 520rpx;
+ margin: 40rpx auto 0;
+}
+.status button{
+ display: block;
+ width: 520rpx;
+ height: 95rpx;
+ line-height: 95rpx;
+ text-align: center;
+ border: none;
+}
+.status button:nth-of-type(1){
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ border:1rpx solid rgba(236,59,45,1);
+ border-radius:48rpx;
+ margin-bottom: 38rpx;
+ color: #fff;
+}
+.status button:nth-of-type(2){
+ background:rgba(255,255,255,1);
+ border:1rpx solid rgba(190,190,190,1);
+ border-radius:48rpx;
+ width:520rpx;
+ color: #333;
+}
\ No newline at end of file
diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js
index fbd544e..9ed624a 100644
--- a/pages/cardListDetail/cardListDetail.js
+++ b/pages/cardListDetail/cardListDetail.js
@@ -234,6 +234,15 @@ Page({
that.countdown(res.data.endTime);
//当前时间与优惠券下架时间做计算
var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss");
+ if (util.timechuo(endTime).indexOf('-') == 0) {
+ that.setData({
+ endtime: "活动已结束",
+ });
+ } else {
+ that.setData({
+ endtime: util.timechuo(endTime)
+ });
+ }
}
wx.hideLoading();
that.setData({
diff --git a/pages/cardListDetail/cardListDetail.wxml b/pages/cardListDetail/cardListDetail.wxml
index c734129..5382e09 100644
--- a/pages/cardListDetail/cardListDetail.wxml
+++ b/pages/cardListDetail/cardListDetail.wxml
@@ -1,4 +1,5 @@
+
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 31c2ddf..9d44ced 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -122,14 +122,14 @@ Page({
var data = {
pageNum: pageNum,
pageSize: 6,
- couponType: "7",
+ couponType: "100",
couponOrderStatus: 4
}
} else if (key == '5,6,7') {
var data = {
pageNum: pageNum,
pageSize: 6,
- couponType: "7",
+ couponType: "100",
statusStr: "5,6,7"
}
}
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 13d599d..8484be7 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -5,17 +5,17 @@ const util = require("../../../utils/util");
const imgurl = require("../../../utils/imgurl");
Page({
data: {
- fenxiangUrl:imgurl.fenxiang.url,
- clockUrl:imgurl.clock.url,
- teljpgUrl:imgurl.teljpg.url,
- closedUrl:imgurl.closed.url,
- quesGouUrl:imgurl.ques_gou.url,
- headbgUrl:imgurl.headbg.url,
- quesBgUrl:imgurl.ques_bg.url,
+ fenxiangUrl: imgurl.fenxiang.url,
+ clockUrl: imgurl.clock.url,
+ teljpgUrl: imgurl.teljpg.url,
+ closedUrl: imgurl.closed.url,
+ quesGouUrl: imgurl.ques_gou.url,
+ headbgUrl: imgurl.headbg.url,
+ quesBgUrl: imgurl.ques_bg.url,
data: {
title: null
},
- showPage:false,
+ showPage: false,
questions1: null,
questions2: null,
carList: [],
@@ -42,11 +42,11 @@ Page({
scaleData: null,
skewData: null,
matrixData: null,
- opacity:0,
- queueData:null,
- zIndex:11,
- display:"none",
- showbutton:false
+ opacity: 0,
+ queueData: null,
+ zIndex: 11,
+ display: "none",
+ showbutton: false
},
phone: function (e) {
let that = this;
@@ -122,7 +122,7 @@ Page({
let that = this;
that.setData({
queueData: null,
- showbutton:true
+ showbutton: true
})
Http.get({
url: config.api.getQuestion,
@@ -144,9 +144,9 @@ Page({
})
that.setData({
queueData: animation.export(),
- zIndex:9,
- opacity:1,
- display:"block",
+ zIndex: 9,
+ opacity: 1,
+ display: "block",
questionnaire: JSON.parse(res.data.content),
questionId: res.data.id
});
@@ -223,7 +223,7 @@ Page({
couponId: options.couponId,
title: that.data.data.title ? that.data.data.title : '',
});
- if(options.cardType){
+ if (options.cardType) {
that.setData({
cardType: options.cardType
})
@@ -235,54 +235,63 @@ Page({
}
};
Http.get(parmer)
- .then(res => {
- if(res.code==200){
+ .then(res => {
+ if (res.code == 200) {
+ that.setData({
+ showPage: true
+ })
+ }
+ if (res.data.type == 7) {
+ wx.setNavigationBarTitle({
+ title: "卡详情"
+ })
+ }
+ if (res.data.endTime) {
+ that.countdown(res.data.endTime);
+ //当前时间与优惠券下架时间做计算
+ var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss");
+ if (util.timechuo(endTime).indexOf('-') == 0) {
+ that.setData({
+ endtime: "活动已结束",
+ });
+ } else {
+ that.setData({
+ endtime: util.timechuo(endTime)
+ });
+ }
+ }
+ wx.hideLoading();
that.setData({
- showPage:true
- })
- }
- if(res.data.type==7){
- wx.setNavigationBarTitle({
- title: "卡详情"
- })
- }
- if (res.data.endTime) {
- that.countdown(res.data.endTime);
- //当前时间与优惠券下架时间做计算
- var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss");
- if (util.timechuo(endTime).indexOf('-') == 0) {
+ data: res.data
+ });
+
+ if (res.data.validType == 1) {
that.setData({
- endtime: "活动已结束",
+ validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
+ validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
});
} else {
- that.setData({
- endtime: util.timechuo(endTime)
- });
+ if (res.data.validDays) {
+ that.setData({
+ validDays: res.data.validDays
+ });
+ }
}
- }
- wx.hideLoading();
- that.setData({
- data: res.data
- });
-
- if (res.data.validType == 1) {
- that.setData({
- validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
- validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"),
- });
- } else {
- that.setData({
- validDays: res.data.validDays
+ }).catch(err => {
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ duration: 2000,
+ mask: false
});
- }
- }).catch(err => {
- wx.showToast({
- title: err.message,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
+ })
+ },
+ /**
+ * 邀请好友继续砍价
+ */
+ inviteFriend: function () {
+ let that = this;
+ that.orderFunc("discount");
},
/**
* 支付订单更新
@@ -302,13 +311,13 @@ Page({
.then(res => {
wx.hideLoading()
// 有价券
- if (!type&&type!='free') {
+ if (!type && type != 'free') {
wx.navigateTo({
url: `/pages/order/detail/index?orderId=${
orderId
}`
});
- }else if(type=='free'){
+ } else if (type == 'free') {
wx.navigateTo({
url: `/pages/order/detail/index?orderId=${
orderId
@@ -328,119 +337,126 @@ Page({
/**
* 发起支付
*/
- orderFunc(flag) {
+ orderFunc(discount) {
var that = this;
- // wx.showLoading({
- // title: "加载中..."
- // });
- Http.post({
- url: config.api.checkPhoneStatus,
- data: {}
- })
- .then(res => {
+ Http.post({
+ url: config.api.checkPhoneStatus,
+ data: {}
+ })
+ .then(res => {
+ if (discount == 'discount') {
var data = {
couponChannelId: "" + that.data.couponChannelId,
+ couponId: "" + that.data.couponId,
+ press: true
+ }
+ } else if (that.data.couponChannelId == null) {
+ var data = {
couponId: "" + that.data.couponId
};
- if (that.data.couponChannelId == null) {
- var data = {
- couponId: "" + that.data.couponId
- };
+ } else {
+ var data = {
+ couponChannelId: "" + that.data.couponChannelId,
+ couponId: "" + that.data.couponId,
}
+ }
+ /**
+ * orderSave 下单
+ */
+ return Http.post({
+ url: config.api.orderSave,
+ data: data
+ });
+ })
+ .catch(err => {
+ console.log(err);
+ if (err.code == 2011) {
+ wx.showToast({
+ title: "商户信息没找到",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 2013) {
+ wx.showToast({
+ title: "商户信息禁用",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3000) {
+ wx.showToast({
+ title: "库存不足",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3001) {
+ wx.showToast({
+ title: "领取达到上限",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3002) {
+ wx.showToast({
+ title: "订单失败",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3003) {
+ wx.showToast({
+ title: "订单不存在",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 3004) {
+ wx.showToast({
+ title: "订单不存在",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 4003) {
+ wx.showToast({
+ title: "卡券已作废",
+ image: './../../../assets/images/fail.png',
+ duration: 2000,
+ mask: false
+ });
+ } else if (err.code == 11005) {
/**
- * orderSave 下单
+ * 将值传到用户手机号授权的页面
+ *
*/
- return Http.post({
- url: config.api.orderSave,
- data: data
+ wx.redirectTo({
+ url: "/pages/getphoneInfo/index?couponChannelId=" +
+ that.data.couponChannelId +
+ "&couponId=" +
+ that.data.couponId
});
- })
- .catch(err => {
- if (err.code == "2011") {
- wx.showToast({
- title: "商户信息没找到",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "2013") {
- wx.showToast({
- title: "商户信息禁用",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "3000") {
- wx.showToast({
- title: "库存不足",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "3001") {
- wx.showToast({
- title: "领取达到上限",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "3002") {
- wx.showToast({
- title: "订单失败",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "3003") {
- wx.showToast({
- title: "订单不存在",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "3004") {
- wx.showToast({
- title: "订单不存在",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == "4003") {
- wx.showToast({
- title: "卡券已作废",
- image:'./../../../assets/images/fail.png',
- duration: 2000,
- mask: false
- });
- } else if (err.code == 11005) {
- /**
- * 将值传到用户手机号授权的页面
- *
- */
- wx.redirectTo({
- url: "/pages/getphoneInfo/index?couponChannelId=" +
- that.data.couponChannelId +
- "&couponId=" +
- that.data.couponId
- });
- } else if (err.code == 11006) {
- // 用户手机已加密
- wx.redirectTo({
- url: "/pages/phoneinput/phoneinput?couponChannelId=" +
- that.data.couponChannelId +
- "&couponId=" +
- that.data.couponId
- });
- } else {
- wx.showToast({
- title: err.message,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- }
- })
- .then(res => {
+ } else if (err.code == 11006) {
+ // 用户手机已加密
+ wx.redirectTo({
+ url: "/pages/phoneinput/phoneinput?couponChannelId=" +
+ that.data.couponChannelId +
+ "&couponId=" +
+ that.data.couponId
+ });
+ } else {
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ }
+ })
+ .then(res => {
+ console.log(res)
+ if (discount != 'discount') {
if (typeof (res) != "undefined") {
let orderId = "" + res.data.id;
that.setData({
@@ -456,7 +472,8 @@ Page({
data: {
orderId: orderId
}
- }).then(res => {
+ })
+ .then(res => {
var payOrderId = "" + res.data.payOrderId;
wx.hideLoading();
wx.requestPayment({
@@ -469,9 +486,9 @@ Page({
wx.showLoading({
title: '订单正在处理中...',
})
- setTimeout(function(){
+ setTimeout(function () {
wx.hideLoading()
- },5000)
+ }, 5000)
that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that);
if (res.errMsg == "requestPayment:ok") {
setTimeout(function () {
@@ -480,12 +497,12 @@ Page({
/**
* 用户支付成功以后跳转到券包列表
*/
- if(that.data.cardType == 7){
+ if (that.data.cardType == 7) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
})
- }else{
+ } else {
wx.setStorage({
key: 'couponNum',
data: "couponNum"
@@ -518,12 +535,12 @@ Page({
} else {
// 免费券
that.payOrderUpdate(orderId, "0", 1, '', 'free');
- if(that.data.cardType == 7){
+ if (that.data.cardType == 7) {
wx.setStorage({
key: 'couponNum2',
data: "couponNum2"
})
- }else{
+ } else {
wx.setStorage({
key: 'couponNum',
data: "couponNum"
@@ -531,19 +548,18 @@ Page({
}
}
}
- })
- .catch(err => {
- wx.showToast({
- title: err.message,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
+ } else {
+ if(res){
+ wx.navigateTo({
+ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.id}`,
+ })
+ }
+ }
+ })
},
- onShow(){
+ onShow() {
this.setData({
- showbutton:false
+ showbutton: false
})
},
onShareAppMessage: function (options) {
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index eded453..93bb026 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -30,11 +30,16 @@
{{data.title}}电子卡
{{data.subTitle}}
- 售价:
+ 售价:
{{data.salePriceStr}}
元
{{data.priceStr}}元
{{data.priceStr}}小时
+ {{data.priceStr}}元
+
+ 可砍至
+ {{data.salePriceStr}}元
+ {{data.priceStr}}元
剩余{{data.remainInventory}}件
@@ -79,7 +84,7 @@
-
+
@@ -88,8 +93,16 @@
-
-
+
+
+
+
+
@@ -101,16 +114,9 @@
{{questionnaire.title}}
-
-
-
-
-
-
+
@@ -118,7 +124,7 @@
{{item.name}}
- 确定
+ 确定
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index ebee87d..d8090ed 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -130,7 +130,6 @@ page {
font-size: 40rpx;
color: #ff4949;
letter-spacing: 0;
- margin-left: 10rpx;
}
.salePriceStr .yuan {
@@ -148,10 +147,12 @@ page {
.throgh {
text-decoration: line-through;
margin-left: 10rpx;
+ color: #999!important;
}
.fl {
float: left;
+ color: red;
}
.fr {
@@ -434,7 +435,7 @@ page {
left: 23rpx;
}
-.btns {
+.btnss {
color: #f8755b;
font-weight: bold;
font-size: 30rpx !important;
@@ -468,3 +469,40 @@ page {
line-height: 70rpx;
color: #333;
}
+.btns{
+ padding: 0 33rpx;
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding-bottom: 37rpx;
+ padding-top:37rpx;
+ z-index: 100;
+ background: #fff;
+}
+.btns > button{
+ width: 330rpx;
+ height: 95rpx;
+ border-radius:48rpx;
+ text-align: center;
+}
+.btns .fl{
+ color: #fff;
+ background:rgba(255,169,2,1);
+ box-shadow:0px 8px 8px 1px rgba(255,169,2,0.32);
+}
+.btns .fl text{
+ display: block;
+ font-size: 30rpx;
+ line-height: 34rpx;
+}
+.btns .fl text:nth-of-type(1){
+ margin-top: 12rpx;
+}
+.btns .fr{
+ font-size: 30rpx;
+ color: #fff;
+ line-height: 95rpx;
+ background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
+ box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32);
+}
diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js
index 9d51041..11144a7 100755
--- a/pages/getuserinfo/index.js
+++ b/pages/getuserinfo/index.js
@@ -10,85 +10,89 @@ Page({
},
onLoad: function(options) {
var that = this;
- if (options.couponChannelId && options.couponId){
+ if (options.couponChannelId && options.couponId||options.orderId) {
that.setData({
couponChannelId: options.couponChannelId,
couponId: options.couponId,
+ orderId:options.orderId
})
}
if (options.path == 'index') {
that.path = options.path
}
Http.get({
- url: config.api.marketicon,
- data: {
- appId: config.weapp.AppId
- }
- }).then(res => {
- that.setData({
- mallImgUrl: res.data.mallImgUrl
- });
- wx.setNavigationBarTitle({
- title: res.data.mallName
+ url: config.api.marketicon,
+ data: {
+ appId: config.weapp.AppId
+ }
+ }).then(res => {
+ that.setData({
+ mallImgUrl: res.data.mallImgUrl
+ });
+ wx.setNavigationBarTitle({
+ title: res.data.mallName
+ })
+ })
+ .catch(err => {
+ wx.showToast({
+ title: err.errMsg,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
})
- })
- .catch(err => {
- wx.showToast({
- title: err.errMsg,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
},
- bindGetUserInfo: function(e) {
- let that=this;
+ bindGetUserInfo: function (e) {
+ let that = this;
var iv = e.detail.iv;
var encryptedData = e.detail.encryptedData;
Http.post({
- url: config.api.getUserInfo,
- data: {
- encryptedData: encryptedData,
- iv: iv
- }
- })
- .then(
- function(res) {
- console.log(res)
- if(that.path=='index'){
- wx.reLaunch({
- url: "/pages/game/index"
- });
+ url: config.api.getUserInfo,
+ data: {
+ encryptedData: encryptedData,
+ iv: iv
}
- else{
- //返回主页
- if (that.data.couponChannelId && that.data.couponId){
- wx.redirectTo({
- url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.couponId}`
- });
- }else{
- wx.switchTab({
- url: "/pages/index/index"
+ })
+ .then(
+ function (res) {
+ console.log(res)
+ if (that.path == 'index') {
+ wx.reLaunch({
+ url: "/pages/game/index"
});
+ } else {
+ //返回主页
+ if (that.data.couponChannelId && that.data.couponId) {
+ wx.redirectTo({
+ url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.couponId}`
+ });
+ } else if (that.data.orderId) {
+ wx.redirectTo({
+ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}&from=${"friend"}`
+ });
+ } else {
+ wx.switchTab({
+ url: "/pages/index/index"
+ });
+ }
}
+ },
+ function (error) {
+ console.log(error)
+ wx.showToast({
+ title: "请授权个人信息",
+ icon: "none"
+ });
}
- },
- function(error) {
- console.log(error)
+ )
+ .catch(err => {
wx.showToast({
- title: "请授权个人信息",
- icon: "none"
+ title: err.errMsg,
+ icon: 'none',
+ duration: 2000,
+ mask: false
});
- }
- )
- .catch(err => {
- wx.showToast({
- title: err.errMsg,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
+ })
}
});
diff --git a/pages/index/index.js b/pages/index/index.js
index 54fe970..395d90b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -10,6 +10,7 @@ Page({
icon001: imgurl.icon001.url,
icon002: imgurl.icon002.url,
icon003: imgurl.icon003.url,
+ icon004: imgurl.icon004.url,
market: app.globalData.market,
list: [],
loading: true,
@@ -167,8 +168,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onLoad: function (options) {
- console.log("AppId:" + config.weapp.AppId)
- console.log("-------------------Yesyyy----------------------------------")
+
wx.setStorageSync('imgurl', imgurl)
if (options.played == "true") {
this.setData({
@@ -186,8 +186,8 @@ Page({
});
}
app.getLocation();
- if (options.couponChannelId && options.couponId) {
- that.userLogin(options.couponChannelId, options.couponId);
+ if (options.couponChannelId && options.couponId||options.orderId) {
+ that.userLogin(options.couponChannelId, options.couponId,options.orderId);
} else {
that.userLogin()
}
@@ -270,7 +270,7 @@ Page({
/**
* 用户登录
*/
- userLogin: function (couponChannelId, couponId) {
+ userLogin: function (couponChannelId, couponId,orderId) {
var that = this;
// 登录
wx.login({
@@ -327,15 +327,19 @@ Page({
if (app.businessListCallback) {
app.businessListCallback(app.globalData.token);
}
- that.checkuerstatus(couponChannelId, couponId);
+ that.checkuerstatus(couponChannelId, couponId,orderId);
})
.catch(err => {
+ wx.showToast({
+ title: err.message,
+ icon:"none"
+ })
});
}
});
},
- checkuerstatus(couponChannelId, couponId) {
+ checkuerstatus(couponChannelId, couponId,orderId) {
Http.post({
url: config.api.checkUserStatus,
data: {}
@@ -345,6 +349,10 @@ Page({
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}`,
})
+ }else if(orderId){
+ wx.navigateTo({
+ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${orderId}&from='${"discount"}`,
+ })
}
})
.catch(err => {
@@ -354,6 +362,10 @@ Page({
wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${couponChannelId}&couponId=${couponId}`
});
+ } else if (orderId) {
+ wx.redirectTo({
+ url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}`
+ });
} else {
wx.redirectTo({
url: '/pages/getuserinfo/index'
@@ -481,6 +493,11 @@ Page({
}
});
},
+ gotoBargain:function(){
+ wx.navigateTo({
+ url: '/pages/bargain/bargain'
+ })
+ },
/**
* 刷新
*/
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b7be929..51eea81 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,6 +10,10 @@
消费卡
+
+
+
+ 砍价专场
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index bed1a3e..d79d77b 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -70,10 +70,10 @@
-
+
-
+
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index e94b7f2..b0174d6 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -22,10 +22,10 @@ Page({
],
list: [],
current: "",
+ loading: true, //"上拉加载"的变量,默认false,隐藏
current_scroll: "1",
- page: 1,
allow_load: true,
- loading: true, //"上拉加载"的变量,默认false,隐藏
+ page: 1,
content: "",
},
onLoad(e) {
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index da9bb6a..2cb9e0d 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -10,10 +10,16 @@
+
+
{{item.title}}
等待付款
待退款
交易关闭
+ 砍价中
+ 砍价成功
+ 砍价失败
+ 砍价取消
已退款
退款失败
免费领取
@@ -41,7 +47,7 @@
查看详情
-
+
去支付
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index c8e2445..924398c 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -84,7 +84,12 @@ text-overflow: ellipsis;
white-space: nowrap;
text-overflow: ellipsis;
}
-
+.discount{
+ position: absolute;
+ width: 100rpx;
+ top:86rpx;
+ right:2rpx;
+}
.info .sucess {
display: inline-block;
width: 123rpx !important;
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 2753b10..6f3c594 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -550,7 +550,7 @@ Page({
syncId: res.data.orderId,
payType: 6, // 小程序支付
CarNumber: carNumber,
- returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback",
+ returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback",
source: "FUMAO-001",
actionId: "1" //操作ID,1:小程序支付
}
diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js
index b63e75c..e3e2414 100644
--- a/pages/specialcourtesy/specialcourtesy.js
+++ b/pages/specialcourtesy/specialcourtesy.js
@@ -36,14 +36,15 @@ Page({
*/
onShow: function () {
let that = this;
- Http.get({
- url: config.api.discountMerchantList,
+ Http.post({
+ url: config.api.getDiscountInfo,
data: {}
})
.then(res=>{
console.log(res)
that.setData({
- discountMerchantList:res.data
+ discountMerchantList: res.data.levelMerchantList,
+ level: res.data.level ? res.data.level:''
})
})
},
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index 5885c7f..5bada9a 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -2,16 +2,16 @@
- 以下为商城会员对应门店的优惠折扣
+ 以下为商城{{level}}对应门店的优惠折扣
-
+
>
- {{item.vipDiscountRate1/1000}}折
+ {{item.discount/10}}折
{{item.merchantName}}
+
diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss
index cb375ff..5bd5ee7 100644
--- a/pages/specialcourtesy/specialcourtesy.wxss
+++ b/pages/specialcourtesy/specialcourtesy.wxss
@@ -1,6 +1,13 @@
Page{
background: #C8223C;
}
+.none{
+ font-size: 28rpx;
+ text-align: center;
+ margin-top: 30rpx;
+ color: #fff;
+ float:none!important;
+}
.headerbg image{
display: block;
width: 100%;
@@ -91,3 +98,6 @@ Page{
.discount text{
font-size: 28rpx;
}
+.level{
+ color: yellow;
+}
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 7c73334..e32fc0b 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -76,7 +76,7 @@
- 版本号:3.2.2
+ 版本号:3.2.3
diff --git a/project.config.json b/project.config.json
index 2970aaf..4e30ca0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
- "appid": "wx649b3be73c1afe47",
+ "appid": "wxea71200db93d756b",
"projectname": "C",
"isGameTourist": false,
"condition": {
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 89bb84f..8595f5e 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -335,5 +335,9 @@ module.exports = {
'icon003': {
'url': baseUrl + 'icon003.png',
'name': ''
+ },
+ 'icon004': {
+ 'url': baseUrl + 'icon004.png',
+ 'name': ''
}
}
\ No newline at end of file