فهرست منبع

weixin-change

2312970463@qq.com 4 سال پیش
والد
کامیت
9edcdfc68b
6فایلهای تغییر یافته به همراه71 افزوده شده و 72 حذف شده
  1. 3 3
      api/api.js
  2. 10 10
      api/store.js
  3. 1 1
      config/app.js
  4. 12 13
      manifest.json
  5. 21 21
      pages.json
  6. 24 24
      pages/index/index.vue

+ 3 - 3
api/api.js

@@ -213,7 +213,7 @@ export function getCity() {
 /**
  * 获取小程序直播列表
  */
-export function getLiveList(page,limit) {
-  return request.get('wechat/live', { page, limit}, { noAuth: true });
-}
+// export function getLiveList(page,limit) {
+//   return request.get('wechat/live', { page, limit}, { noAuth: true });
+// }
 

+ 10 - 10
api/store.js

@@ -373,20 +373,20 @@ export function getSeckillProductDetail(id) {
  * 直播推荐列表
  * @returns {*}
  */
-export function getLiveList() {
-	return request.get("broadcast/hot", {}, {
-		noAuth: true
-	});
-}
+// export function getLiveList() {
+// 	return request.get("broadcast/hot", {}, {
+// 		noAuth: true
+// 	});
+// }
 /**
  * 直播列表
  * @returns {*}
  */
-export function getBroadcastListApi(data) {
-	return request.get("broadcast/lst", data, {
-		noAuth: true
-	});
-}
+// export function getBroadcastListApi(data) {
+// 	return request.get("broadcast/lst", data, {
+// 		noAuth: true
+// 	});
+// }
 /**
  * 商户分类
  * @returns {*}

+ 1 - 1
config/app.js

@@ -4,7 +4,7 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 
 // 网络接口修改此字符 小程序域名要求https
 
-let httpApi = 'http://zccy.liuniu946.com' //测试站
+let httpApi = 'http://wcy.liuniu946.com' //测试站
 // let httpApi = 'http://192.168.31.50:8324' //本地
 
 // let httpApi = 'https://mer.crmeb.net'

+ 12 - 13
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "加载中...",
+    "name" : "爱特思悦购",
     "appid" : "__UNI__06E0263",
     "description" : "",
     "versionName" : "1.0.0",
@@ -56,7 +56,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5fb1cc8edb3f8baa",
+        "appid" : "wxc0ed72f457d6f3da",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -85,18 +85,17 @@
     },
     "h5" : {
         "devServer" : {
-            "https" : false,
-			"proxy" : {
-			    "/api" : {
-			        "target" : "https://zccy.liuniu946.com", //请求的目标域名
-			        "changeOrigin" : true,
-			        // "secure": false,
-			        "pathRewrite" : {
-						// "^/api": "/"
-					}
-			    }
-			}
+            "https" : false
+            // "proxy" : {
+            //     "/api" : {
+            //         "target" : "https://zccy.liuniu946.com", //请求的目标域名
+            //         "changeOrigin" : true,
+            //         // "secure": false,
+            //         "pathRewrite" : {}
+            //     }
+            // }
         },
+        // "^/api": "/"
         "router" : {
             "mode" : "history",
             "base" : ""

+ 21 - 21
pages.json

@@ -589,12 +589,12 @@
 					}
 				}
 			]
-			,"plugins": {
-				"live-player-plugin": {
-					"version": "1.3.0",
-					"provider": "wx2b03c6e691cd7370"
-				}
-			}
+			// ,"plugins": {
+			// 	"live-player-plugin": {
+			// 		"version": "1.3.0",
+			// 		"provider": "wx2b03c6e691cd7370"
+			// 	}
+			// }
 		},
 		{
 			"root": "pages/chat",
@@ -637,14 +637,14 @@
 						// #endif
 					}
 				},
-				{
-					"path": "liveBroadcast/index",
-					"style": {
-						"navigationBarTitleText": "直播列表",
-						"navigationBarBackgroundColor": "#F2F2F2"
+				// {
+				// 	"path": "liveBroadcast/index",
+				// 	"style": {
+				// 		"navigationBarTitleText": "直播列表",
+				// 		"navigationBarBackgroundColor": "#F2F2F2"
 
-					}
-				},
+				// 	}
+				// },
 				{
 					"path": "presell/index",
 					"style": {
@@ -746,26 +746,26 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/images/1-001.png",
-				"selectedIconPath": "static/images/1-002.png",
+				"iconPath": "./static/images/1-001.png",
+				"selectedIconPath": "./static/images/1-002.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/goods_cate/goods_cate",
-				"iconPath": "static/images/2-001.png",
-				"selectedIconPath": "static/images/2-002.png",
+				"iconPath": "./static/images/2-001.png",
+				"selectedIconPath": "./static/images/2-002.png",
 				"text": "分类"
 			},
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
-				"iconPath": "static/images/3-001.png",
-				"selectedIconPath": "static/images/3-002.png",
+				"iconPath": "./static/images/3-001.png",
+				"selectedIconPath": "./static/images/3-002.png",
 				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "static/images/4-001.png",
-				"selectedIconPath": "static/images/4-002.png",
+				"iconPath": "./static/images/4-001.png",
+				"selectedIconPath": "./static/images/4-002.png",
 				"text": "我的"
 			}
 		]

+ 24 - 24
pages/index/index.vue

@@ -167,11 +167,11 @@
 			</view>
 			<!-- #ifdef MP -->
 			<!--直播-->
-			<view class="main" v-if="liveList.length > 0">
+			<!-- <view class="main" v-if="liveList.length > 0">
 				<view class="live-count">
-					<view>
+					<view> -->
 						<!-- 直播 -->
-						<block>
+						<!-- <block>
 							<view class="spike-bd">
 								<view class="title line1">直播专场</view>
 								<navigator url="/pages/activity/liveBroadcast/index" class="more-btn" hover-class="none">更多<text class="iconfont icon-jiantou"
@@ -201,16 +201,16 @@
 												</block>
 											</view>
 											<view v-if="item.live_status == 101 || item.live_status == 102" class="broadcast-time">{{ item.show_time }}</view>
-											<image :src="item.share_img"></image>
+											<image :src="item.share_img"></image> -->
 											<!-- <view class="live-title">{{ item.live_status }}</view> -->
-										</navigator>
+										<!-- </navigator>
 									</view>
 								</scroll-view>
 							</view>
 						</block>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<!--预售-->
 			<view class="main" v-if="presellList.length > 0">
@@ -406,9 +406,9 @@
 		SUBSCRIBE_MESSAGE,
 		TIPS_KEY
 	} from '@/config/cache';
-	import {
-		getLiveList
-	} from '@/api/store.js';
+	// import {
+	// 	getLiveList
+	// } from '@/api/store.js';
 	// #endif
 
 	import {
@@ -523,7 +523,7 @@
 				couponList: [],
 				lovely: [],
 				spikeList: [], //秒杀
-				liveList: [], //直播
+				// liveList: [], //直播
 				presellList: [], //预售
 				assistList: [], //助力
 				assistUserList: [], //已助力数据
@@ -665,7 +665,7 @@
 				this.getCombinationProduct(), this.getPresellProduct(), this.getAssistProduct(), this.getAssistUserCount(),
 			]);
 			// #ifdef MP
-			this.getLiveLists()
+			// this.getLiveLists()
 			// #endif
 			if (this.isLogin) {
 				this.getUserInfo();
@@ -837,19 +837,19 @@
 			},
 			// #ifdef MP
 			// 直播
-			getLiveLists() {
-				let that = this;
-				getLiveList({
-					limit: 10
-				}).then(res => {
-					that.liveList = res.data.list;
-					that.liveList.forEach((val) => {
-						val.link = ((val.live_status == 103 && val.replay_status) || val.live_status === 101 || val.live_status ===
-							102) ? 'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + val.room_id : ''
-					});
-
-				}).catch((e) => {});;
-			},
+			// getLiveLists() {
+			// 	let that = this;
+			// 	getLiveList({
+			// 		limit: 10
+			// 	}).then(res => {
+			// 		that.liveList = res.data.list;
+			// 		that.liveList.forEach((val) => {
+			// 			val.link = ((val.live_status == 103 && val.replay_status) || val.live_status === 101 || val.live_status ===
+			// 				102) ? 'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + val.room_id : ''
+			// 		});
+
+			// 	}).catch((e) => {});;
+			// },
 			// #endif
 			// 拼团
 			getCombinationProduct() {