From 62c239275bce0fc8b760cb5b708fb8f92a77fd63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Thu, 23 Sep 2021 16:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/diandeng.js | 2 +-
components/ShopLiveCard.vue | 2 +-
config/index.js | 4 ++--
manifest.json | 18 +++++++++---------
pages/home/components/Live.vue | 2 +-
pages/user/PersonalData/index.vue | 6 ++++++
pages/user/User/index.vue | 5 ++++-
7 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/api/diandeng.js b/api/diandeng.js
index 6802616..f4a2a25 100644
--- a/api/diandeng.js
+++ b/api/diandeng.js
@@ -46,7 +46,7 @@ export function addBlessing(data) {
* 万年历
*/
export function getWanniali(data) {
- return request.get("/Wannianli/getWanniali?date", data);
+ return request.get("/Wannianli/getWanniali?date="+data);
}
/**
diff --git a/components/ShopLiveCard.vue b/components/ShopLiveCard.vue
index 697e319..a886766 100644
--- a/components/ShopLiveCard.vue
+++ b/components/ShopLiveCard.vue
@@ -39,7 +39,7 @@
HAS_LIVE = true
let livePlayer = null;
if (HAS_LIVE) {
- livePlayer = requirePlugin('live-player-plugin');
+ // livePlayer = requirePlugin('live-player-plugin');
}
// #endif
let timer = null;
diff --git a/config/index.js b/config/index.js
index 8e753ab..a50e9b6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api'
-// export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api'
-export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api'
+export const VUE_APP_API_URL = 'http://192.168.0.114:8098/api'
+// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api'
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
diff --git a/manifest.json b/manifest.json
index ca0cb31..c1d1cf8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -135,7 +135,7 @@
},
"quickapp" : {},
"mp-weixin" : {
- "appid" : "wx030578b829a4a49a",
+ "appid" : "wx240613bb73760835",
"setting" : {
"urlCheck" : false,
"es6" : true,
@@ -147,14 +147,14 @@
"scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示"
}
- },
- "plugins" : {
- // #ifdef MP-WEIXIN
- "live-player-plugin" : {
- "version" : "1.2.8",
- "provider" : "wx2b03c6e691cd7370"
- }
- }
+ }
+ // "plugins" : {
+ // // #ifdef MP-WEIXIN
+ // "live-player-plugin" : {
+ // "version" : "1.2.8",
+ // "provider" : "wx2b03c6e691cd7370"
+ // }
+ // }
},
// #endif
"mp-alipay" : {
diff --git a/pages/home/components/Live.vue b/pages/home/components/Live.vue
index 14c70c1..cbef64e 100644
--- a/pages/home/components/Live.vue
+++ b/pages/home/components/Live.vue
@@ -28,7 +28,7 @@
HAS_LIVE = true
let livePlayer = null;
if (HAS_LIVE) {
- livePlayer = requirePlugin('live-player-plugin');
+ // livePlayer = requirePlugin('live-player-plugin');
}
// #endif
import {
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index e751194..f07cb8a 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -285,6 +285,12 @@ export default {
setTimeout(()=>{
this.$yrouter.back();
},2000)
+ } else{
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ duration: 2000,
+ });
}
},
(err) => {
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 617df35..6b0f461 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -60,7 +60,7 @@
{{item.courseStartTime.split(' ')[0]}}~{{item.courseEndTime.split(' ')[0]}}
- 地点：{{item.coursePlace}}
+ 地点：{{item.coursePlace}}
扫一扫
已签到
@@ -675,6 +675,9 @@ export default {
}
}
.address-box{
+ .address{
+ width: calc(100% - 190rpx);
+ }
.btn{
width: 172rpx;
height: 56rpx;