Преглед на файлове

CJY
1.测试配置修改
2.按照文档注释掉直播

(cherry picked from commit 42b5e6ba8c329b5425ceca68da3b11502f7b2426)

DESKTOP-27280RH\CJY преди 3 години
родител
ревизия
a3fc31b224

+ 1 - 1
components/canvasShow/basics/live/app/item.vue

@@ -94,7 +94,7 @@ import { startLiveTemplate } from '@/config/subscribe.js'
 import { liveAppid } from '@/config/live.js'
 import { liveAppid } from '@/config/live.js'
 
 
 // #ifdef MP-WEIXIN
 // #ifdef MP-WEIXIN
-const livePlayer = requirePlugin('live-player-plugin')
+// const livePlayer = requirePlugin('live-player-plugin')
 // #endif
 // #endif
 export default {
 export default {
   props: {
   props: {

+ 5 - 5
components/canvasShow/canvasShowPage.vue

@@ -105,11 +105,11 @@
                 :terminal="terminal"
                 :terminal="terminal"
                 :typeId="typeId"
                 :typeId="typeId"
                 :shopId="shopId"></com-shop>
                 :shopId="shopId"></com-shop>
-      <com-live v-if="item.type==='live'"
-                :componentContent="item.componentContent"
-                :terminal="terminal"
-                :typeId="typeId"
-                :shopId="shopId"></com-live>
+<!--      <com-live v-if="item.type==='live'"-->
+<!--                :componentContent="item.componentContent"-->
+<!--                :terminal="terminal"-->
+<!--                :typeId="typeId"-->
+<!--                :shopId="shopId"></com-live>-->
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

+ 1 - 1
components/canvasShow/config/api.js

@@ -2,7 +2,7 @@
 
 
 // 获取当前环境变量 true => 生产环境 false => 开发环境
 // 获取当前环境变量 true => 生产环境 false => 开发环境
 // const BASEURL = process.env.VUE_APP_DOMAIN_PREFIX
 // const BASEURL = process.env.VUE_APP_DOMAIN_PREFIX
-const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://ceres.zkthink.com/api' : 'https://ceres.zkthink.com/api'
+const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://yfshopdemo.youfukeji.cn/api' : 'http://127.0.0.1:9007'
 // const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://127.0.0.1:9007' : 'http://127.0.0.1:9007'
 // const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://127.0.0.1:9007' : 'http://127.0.0.1:9007'
 
 
 
 

+ 1 - 1
config/api.js

@@ -1,5 +1,5 @@
 // const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
 // const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
-const DOMAIN_PREFIX = 'https://ceres.zkthink.com/api'
+const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
 
 
 // https://ceresdev.zkthink.com
 // https://ceresdev.zkthink.com
 // #ifndef H5
 // #ifndef H5

+ 2 - 2
manifest.json

@@ -1,6 +1,6 @@
 {
 {
     "name" : "cereshop",
     "name" : "cereshop",
-    "appid" : "__UNI__F5FF24E",
+    "appid" : "__UNI__D9B5C43",
     "description" : "cereshop",
     "description" : "cereshop",
     "versionName" : "1.7.4",
     "versionName" : "1.7.4",
     "versionCode" : 174,
     "versionCode" : 174,
@@ -118,7 +118,7 @@
     "quickapp" : {},
     "quickapp" : {},
     /* 快应用特有相关 */
     /* 快应用特有相关 */
     "mp-weixin" : {
     "mp-weixin" : {
-        "appid" : "wxf0713a10bbae8732",
+        "appid" : "wxeb70a7b4e1766969",
         "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
         "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
         "setting" : {
         "setting" : {
             "urlCheck" : false,
             "urlCheck" : false,

+ 10 - 10
pages.json

@@ -581,16 +581,16 @@
 						"enablePullDownRefresh": false
 						"enablePullDownRefresh": false
 					}
 					}
 				},
 				},
-				{
-					"path": "livePage/index",
-					"style": {
-						"navigationBarTitleText": "直播推荐",
-						"navigationBarBackgroundColor": "#333333",
-						"backgroundColor": "#333333",
-						"navigationBarTextStyle": "white",
-						"enablePullDownRefresh": true
-					}
-				},
+//				{
+//					"path": "livePage/index",
+//					"style": {
+//						"navigationBarTitleText": "直播推荐",
+//						"navigationBarBackgroundColor": "#333333",
+//						"backgroundColor": "#333333",
+//						"navigationBarTextStyle": "white",
+//						"enablePullDownRefresh": true
+//					}
+//				},
 				{
 				{
 					"path": "channelCoupon/index",
 					"path": "channelCoupon/index",
 					"style": {
 					"style": {

+ 1 - 1
pages_category_page2/livePage/components/liveBox.vue

@@ -88,7 +88,7 @@ import { startLiveTemplate } from '@/config/subscribe.js'
 import { liveAppid } from '@/config/live.js'
 import { liveAppid } from '@/config/live.js'
 
 
 // #ifdef MP-WEIXIN
 // #ifdef MP-WEIXIN
-const livePlayer = requirePlugin('live-player-plugin')
+// const livePlayer = requirePlugin('live-player-plugin')
 // #endif
 // #endif
 export default {
 export default {
   props: {
   props: {