From 13bb7a1c1b2bbded055b3a7109a5b1d9443eba1e Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 08:53:59 +0800
Subject: [PATCH] 1
---
app.json | 2 +-
app.js | 4 ++--
pages/service/service2.js | 9 ---------
pages/service/details.wxml | 3 +--
utils/util.js | 2 +-
project.config.json | 7 ++++---
6 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/app.js b/app.js
index b83ba5e..c201d3e 100644
--- a/app.js
+++ b/app.js
@@ -6,11 +6,11 @@
// baseUrl: "https://xcxhive2.jyymatrix.cc",
//测试环境
- baseUrl : "https://testhive.jyymatrix.cc",
+ // baseUrl : "https://testhive.jyymatrix.cc",
//本地环境
- // baseUrl : "http://localhost:8080",
+ baseUrl : "http://localhost:8080",
//登录后获得的token
loginToken: "",
diff --git a/app.json b/app.json
index 855ca29..b6b0c0f 100644
--- a/app.json
+++ b/app.json
@@ -53,7 +53,7 @@
],
"window": {
"backgroundTextStyle": "light",
- "navigationBarTitleText": "肽妍",
+ "navigationBarTitleText": "蜂巢美业",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fff"
},
diff --git a/pages/service/details.wxml b/pages/service/details.wxml
index 51c8944..9a2bb43 100644
--- a/pages/service/details.wxml
+++ b/pages/service/details.wxml
@@ -182,8 +182,7 @@
</view>
</view>
- <view wx:if="{{goodsInfo.stockNum>0 && goodsInfo.isService==2 }}" class='detail_cart detail_pay' bindtap='buy'>立刻购买</view>
- <view wx:if="{{goodsInfo.stockNum>0 && goodsInfo.isService==1 }}" class='detail_cart detail_pay' bindtap='yuyue'>预约</view>
+ <view wx:if="{{goodsInfo.stockNum>0}}" class='detail_cart detail_pay' bindtap='buy'>立刻购买</view>
<view wx:if="{{goodsInfo.stockNum<1}}" class='detail_cart detail_pay'>已售罄</view>
</view>
diff --git a/pages/service/service2.js b/pages/service/service2.js
index 850fcca..2ffb78a 100644
--- a/pages/service/service2.js
+++ b/pages/service/service2.js
@@ -178,22 +178,13 @@
var _this = this;
var id = e.currentTarget.dataset.id;
var service = e.currentTarget.dataset.service;
- if (service == 1) {
-
this.checkUserInfoIsBuding()
-
var index = e.currentTarget.dataset.index;
-
var product = this.data.productList[index];
wx.setStorageSync('chooseService', product);
- wx.switchTab({
- url: '/pages/yuyue/khyuyue'
- });
- } else {
wx.navigateTo({
url: '/pages/service/details?id=' + id,
})
- }
},
diff --git a/project.config.json b/project.config.json
index ec6fc68..0175b15 100644
--- a/project.config.json
+++ b/project.config.json
@@ -21,21 +21,22 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
- "useMultiFrameRuntime": false,
+ "useMultiFrameRuntime": true,
"useApiHook": true,
+ "useApiHostProcess": false,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
+ "enableEngineNative": false,
"bundle": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
+ "userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
- "enableEngineNative": false,
- "userConfirmedBundleSwitch": false,
"minifyWXSS": true
},
"compileType": "miniprogram",
diff --git a/utils/util.js b/utils/util.js
index 6fc81a6..5c503c6 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -2,7 +2,7 @@
* 通用js
*/
-var debugHost='www.baidu.com';
+var debugHost='testhive.jyymatrix.cc';
// api地址，请求参数，回调函数，是否遮罩
function request(params) {
--
Gitblit v1.9.1