1

.gitignore

@@ -0,0 +1,25 @@
+.DS_Store
+node_modules
+/dist
+.hbuilderx
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+build.sh
+.idea
+unpackage

config/app.js

@@ -2,7 +2,8 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `https://demo.crmeb.com`,
+	HTTP_REQUEST_URL: `http://rzds.njrzwl.cn`,
+	// HTTP_REQUEST_URL: `https://demo.crmeb.com`,
 	// #endif
 
 	// H5配置

manifest.json

@@ -181,7 +181,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3b82801238ca1b57",
+        "appid" : "wx3035272242596f6e",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

pages.json

@@ -961,13 +961,13 @@
 					}
 				}
 				// #endif
-			],
+			]
-			"plugins": {
+			// "plugins": {
-				"live-player-plugin": {
+			// 	"live-player-plugin": {
-					"version": "1.3.5",
+			// 		"version": "1.3.5",
-					"provider": "wx2b03c6e691cd7370"
+			// 		"provider": "wx3035272242596f6e"
-				}
+			// 	}
-			}
+			// }
 		},
 		{
 			"root": "pages/goods_details",
@@ -1548,32 +1548,32 @@
 		}
 	],
 	"tabBar": { // 底部菜单
-		"color": "#282828",
+		"color": "#999999",
-		"selectedColor": "#ff3366",
+		"selectedColor": "#A8D178",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/images/1-001.png",
+				"iconPath": "static/images/1.png",
-				"selectedIconPath": "static/images/1-002.png",
+				"selectedIconPath": "static/images/11.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/goods_cate/goods_cate",
-				"iconPath": "static/images/2-001.png",
+				"iconPath": "static/images/2.png",
-				"selectedIconPath": "static/images/2-002.png",
+				"selectedIconPath": "static/images/22.png",
 				"text": "分类"
 			},
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
-				"iconPath": "static/images/3-001.png",
+				"iconPath": "static/images/3.png",
-				"selectedIconPath": "static/images/3-002.png",
+				"selectedIconPath": "static/images/33.png",
 				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "static/images/4-001.png",
+				"iconPath": "static/images/4.png",
-				"selectedIconPath": "static/images/4-002.png",
+				"selectedIconPath": "static/images/44.png",
 				"text": "我的"
 			}
 		]
@@ -1582,7 +1582,7 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "加载中",
 		"navigationBarBackgroundColor": "#fff",
-		"backgroundColor": "#F8F8F8",
+		"backgroundColor": "#F5F6F7",
 		"titleNView": false
 	},
 	"condition": { //模式配置，仅开发期间生效

pages/annex/special/index.vue

@@ -32,8 +32,8 @@
 						:isSortType="isSortType"></goodList>
 					<guide v-if="item.name == 'guide'" :dataConfig="item" :isSortType="isSortType"></guide>
 					<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item"></headerSerch>
-					<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item" :isSortType="isSortType">
+				<!-- 	<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item" :isSortType="isSortType">
-					</liveBroadcast>
+					</liveBroadcast> -->
 					<menus v-if="item.name == 'menus'" :dataConfig="item" :isSortType="isSortType"></menus>
 					<news v-if="item.name == 'news'" :dataConfig="item" :isSortType="isSortType"></news>
 					<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item" :isSortType="isSortType">
@@ -206,7 +206,7 @@
 	import customerService from '@/pages/index/diy/components/customerService';
 	import goodList from '@/pages/index/diy/components/goodList';
 	import guide from '@/pages/index/diy/components/guide';
-	import liveBroadcast from '@/pages/index/diy/components/liveBroadcast';
+	// import liveBroadcast from '@/pages/index/diy/components/liveBroadcast';
 	import menus from '@/pages/index/diy/components/menus';
 	import news from '@/pages/index/diy/components/news';
 	import pictureCube from '@/pages/index/diy/components/pictureCube';
@@ -278,7 +278,7 @@
 			customerService,
 			goodList,
 			guide,
-			liveBroadcast,
+			// liveBroadcast,
 			menus,
 			pictureCube,
 			news,

pages/columnGoods/live_list/index.vue

@@ -3,7 +3,7 @@
 	<view v-if="liveList.length > 0">
 		<view class="live-wrapper-b">
 			<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index"
-				:url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
+				:url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
 				hover-class="none" :style="[{'background':bg},{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 				<view class="img-box">
 					<view class="label bgblue" v-if="item.live_status == 102">

pages/index/diy/components/liveBroadcast.vue

@@ -9,7 +9,7 @@
 			<!--  -->
 			<block v-if="listStyle == 0">
 				<view class="live-wrapper-a">
-					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
+					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 						<view class="img-box">
 							<view class="label bgblue" v-if="item.live_status == 102">
 								<view class="txt">{{$t(`预告`)}}</view>
@@ -58,7 +58,7 @@
 			</block>
 			<block v-if="listStyle == 1">
 				<view class="live-wrapper-b">
-					<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
+					<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 						<view class="img-box">
 							<view class="label bgblue" v-if="item.live_status == 102">
 								<view class="txt">{{$t(`预告`)}}</view>
@@ -86,7 +86,7 @@
 			</block>
 			<block v-if="listStyle == 2">
 				<view class="live-wrapper-a live-wrapper-c">
-					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
+					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
 						<view class="img-box">
 							<view class="label bgblue" v-if="item.live_status == 102">
 								<view class="txt">{{$t(`预告`)}}</view>

pages/index/diy/index.vue

@@ -32,8 +32,8 @@
 						:isSortType="isSortType"></goodList>
 					<guide v-if="item.name == 'guide'" :dataConfig="item" :isSortType="isSortType"></guide>
 					<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item"></headerSerch>
-					<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item" :isSortType="isSortType">
+				<!-- 	<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item" :isSortType="isSortType">
-					</liveBroadcast>
+					</liveBroadcast> -->
 					<menus v-if="item.name == 'menus'" :dataConfig="item" :isSortType="isSortType"></menus>
 					<news v-if="item.name == 'news'" :dataConfig="item" :isSortType="isSortType"></news>
 					<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item" :isSortType="isSortType">
@@ -206,7 +206,7 @@
 	import customerService from './components/customerService';
 	import goodList from './components/goodList';
 	import guide from './components/guide';
-	import liveBroadcast from './components/liveBroadcast';
+	// import liveBroadcast from './components/liveBroadcast';
 	import menus from './components/menus';
 	import news from './components/news';
 	import pictureCube from './components/pictureCube';
@@ -278,7 +278,7 @@
 			customerService,
 			goodList,
 			guide,
-			liveBroadcast,
+			// liveBroadcast,
 			menus,
 			pictureCube,
 			news,

pages/index/visualization/components/alive.vue

@@ -10,7 +10,7 @@
 				</view>
 				<view class="live-wrapper-a">
 					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index"
-						:url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
+						:url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
 						hover-class="none">
 						<view class="img-box">
 							<view class="bgblue" v-if="item.live_status == 102">
@@ -85,7 +85,7 @@
 				</view>
 				<view class="live-wrapper-a">
 					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index"
-						:url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
+						:url="'plugin-private://wx3035272242596f6e/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params"
 						hover-class="none">
 						<view class="img-box">
 							<view class="bgblue" v-if="item.live_status == 102">