上传代码

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);
 }
 
 /**

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;

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 = 'http://192.168.0.114:8098/api'
-export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/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';

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" : {
+        // "plugins" : {
-            // #ifdef MP-WEIXIN
+        //     // #ifdef MP-WEIXIN
-            "live-player-plugin" : {
+        //     "live-player-plugin" : {
-                "version" : "1.2.8",
+        //         "version" : "1.2.8",
-                "provider" : "wx2b03c6e691cd7370"
+        //         "provider" : "wx2b03c6e691cd7370"
-            }
+        //     }
-        }
+        // }
     },
     // #endif
     "mp-alipay" : {

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 {

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) => {

pages/user/User/index.vue

@@ -60,7 +60,7 @@
 							<view class="time">{{item.courseStartTime.split(' ')[0]}}~{{item.courseEndTime.split(' ')[0]}}</view>
 						</view>
 						<view class="address-box acea-row row-between row-middle">
-							<view class="address">地点：{{item.coursePlace}}</view>
+							<view class="address line1">地点：{{item.coursePlace}}</view>
 							<view class="btn" @click.stop="startQr()" v-if="item.signState == 2">扫一扫</view>
 							<view class="btn" v-if="item.signState == 1">已签到</view>
 						</view>
@@ -675,6 +675,9 @@ export default {
 			}
 		}
 		.address-box{
+			.address{
+				width: calc(100% - 190rpx);
+			}
 			.btn{
 				width: 172rpx;
 				height: 56rpx;