From 1ea9fb27fdac2df9de2bfca4c3428f71bfaad6d2 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 12 Feb 2019 10:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1000933=E3=80=91=EF=BC=9A=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E7=A0=8D=E4=BB=B7=E5=95=86=E5=93=81=E5=94=AE=E7=BD=84?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=94=AE?=
=?UTF-8?q?=E7=BD=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 6 +++---
pages/bargain/bargain.wxml | 3 ++-
pages/bargain/bargain.wxss | 3 +++
pages/coupon/detail/index.js | 1 +
project.config.json | 4 ++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/config/config.js b/config/config.js
index 534b3b9..6c90f14 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,9 +1,9 @@
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
var appId = extConfig.appId;
var config = {
- // url: "https://ciformall.youlane.cn/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:'https://ctest.malls.iformall.com/C/api',
// url:'http://10.100.33.70:7000/C/api',
// url: 'http://202.165.179.86:4000/C/api',
api: {
@@ -219,7 +219,7 @@ var config = {
},
weapp: {
- AppId: "wx649b3be73c1afe47"
+ AppId: "wxea71200db93d756b"
},
ErrorCode: {
diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml
index 60d44ed..597b000 100644
--- a/pages/bargain/bargain.wxml
+++ b/pages/bargain/bargain.wxml
@@ -13,7 +13,8 @@
{{item.priceStr}}元
可砍至{{item.salePriceStr}}元
- 发起砍价
+ 发起砍价
+ 已售罄
{{content}}
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index fac10f6..19ae8f3 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -106,6 +106,9 @@ page{
font-size:26rpx;
color:rgba(255,255,255,1);
}
+.botton02{
+ background: #ccc!important;
+}
.botton2{
position: absolute;
right: 0;
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index f561ea1..b5aaf32 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -229,6 +229,7 @@ Page({
couponId: options.couponId,
title: that.data.data.title ? that.data.data.title : '',
});
+
if (options.cardType) {
that.setData({
cardType: options.cardType
diff --git a/project.config.json b/project.config.json
index 8a03963..4e30ca0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
- "urlCheck": true,
+ "urlCheck": false,
"es6": true,
"postcss": true,
"minified": true,
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
- "appid": "wx649b3be73c1afe47",
+ "appid": "wxea71200db93d756b",
"projectname": "C",
"isGameTourist": false,
"condition": {