diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0c44574
--- /dev/null
+++ b/.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
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index c8eb676..4e79342 100644
--- a/config/app.js
+++ b/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配置
diff --git a/manifest.json b/manifest.json
index 28c367f..0f29db0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -181,7 +181,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx3b82801238ca1b57",
+ "appid" : "wx3035272242596f6e",
"setting" : {
"urlCheck" : false,
"minified" : true,
diff --git a/pages.json b/pages.json
index 663134b..3e88cc0 100644
--- a/pages.json
+++ b/pages.json
@@ -961,13 +961,13 @@
}
}
// #endif
- ],
- "plugins": {
- "live-player-plugin": {
- "version": "1.3.5",
- "provider": "wx2b03c6e691cd7370"
- }
- }
+ ]
+ // "plugins": {
+ // "live-player-plugin": {
+ // "version": "1.3.5",
+ // "provider": "wx3035272242596f6e"
+ // }
+ // }
},
{
"root": "pages/goods_details",
@@ -1548,32 +1548,32 @@
}
],
"tabBar": { // 底部菜单
- "color": "#282828",
- "selectedColor": "#ff3366",
+ "color": "#999999",
+ "selectedColor": "#A8D178",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"list": [{
"pagePath": "pages/index/index",
- "iconPath": "static/images/1-001.png",
- "selectedIconPath": "static/images/1-002.png",
+ "iconPath": "static/images/1.png",
+ "selectedIconPath": "static/images/11.png",
"text": "首页"
},
{
"pagePath": "pages/goods_cate/goods_cate",
- "iconPath": "static/images/2-001.png",
- "selectedIconPath": "static/images/2-002.png",
+ "iconPath": "static/images/2.png",
+ "selectedIconPath": "static/images/22.png",
"text": "分类"
},
{
"pagePath": "pages/order_addcart/order_addcart",
- "iconPath": "static/images/3-001.png",
- "selectedIconPath": "static/images/3-002.png",
+ "iconPath": "static/images/3.png",
+ "selectedIconPath": "static/images/33.png",
"text": "购物车"
},
{
"pagePath": "pages/user/index",
- "iconPath": "static/images/4-001.png",
- "selectedIconPath": "static/images/4-002.png",
+ "iconPath": "static/images/4.png",
+ "selectedIconPath": "static/images/44.png",
"text": "我的"
}
]
@@ -1582,7 +1582,7 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText": "加载中",
"navigationBarBackgroundColor": "#fff",
- "backgroundColor": "#F8F8F8",
+ "backgroundColor": "#F5F6F7",
"titleNView": false
},
"condition": { //模式配置，仅开发期间生效
diff --git a/pages/annex/special/index.vue b/pages/annex/special/index.vue
index 86c20d8..1132bb7 100644
--- a/pages/annex/special/index.vue
+++ b/pages/annex/special/index.vue
@@ -32,8 +32,8 @@
: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,
diff --git a/pages/columnGoods/live_list/index.vue b/pages/columnGoods/live_list/index.vue
index 93dc81b..162793b 100644
--- a/pages/columnGoods/live_list/index.vue
+++ b/pages/columnGoods/live_list/index.vue
@@ -3,7 +3,7 @@
diff --git a/pages/index/diy/components/liveBroadcast.vue b/pages/index/diy/components/liveBroadcast.vue
index d1be7bd..81f5a56 100644
--- a/pages/index/diy/components/liveBroadcast.vue
+++ b/pages/index/diy/components/liveBroadcast.vue
@@ -9,7 +9,7 @@
-
+
{{$t(`预告`)}}
@@ -58,7 +58,7 @@
-
+
{{$t(`预告`)}}
@@ -86,7 +86,7 @@
-
+
{{$t(`预告`)}}
diff --git a/pages/index/diy/index.vue b/pages/index/diy/index.vue
index 99321e8..5d906e7 100644
--- a/pages/index/diy/index.vue
+++ b/pages/index/diy/index.vue
@@ -32,8 +32,8 @@
: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,
diff --git a/pages/index/visualization/components/alive.vue b/pages/index/visualization/components/alive.vue
index 059c55e..da50531 100644
--- a/pages/index/visualization/components/alive.vue
+++ b/pages/index/visualization/components/alive.vue
@@ -10,7 +10,7 @@
@@ -85,7 +85,7 @@
diff --git a/static/images/1-001.png b/static/images/1-001.png
deleted file mode 100644
index c2d7fae..0000000
Binary files a/static/images/1-001.png and /dev/null differ
diff --git a/static/images/1-002.png b/static/images/1-002.png
deleted file mode 100644
index c6bd228..0000000
Binary files a/static/images/1-002.png and /dev/null differ
diff --git a/static/images/1.png b/static/images/1.png
new file mode 100644
index 0000000..674fdc1
Binary files /dev/null and b/static/images/1.png differ
diff --git a/static/images/11.png b/static/images/11.png
new file mode 100644
index 0000000..4cc86d0
Binary files /dev/null and b/static/images/11.png differ
diff --git a/static/images/2-001.png b/static/images/2-001.png
deleted file mode 100644
index a25cf93..0000000
Binary files a/static/images/2-001.png and /dev/null differ
diff --git a/static/images/2-002.png b/static/images/2-002.png
deleted file mode 100644
index 76aa0d2..0000000
Binary files a/static/images/2-002.png and /dev/null differ
diff --git a/static/images/2.png b/static/images/2.png
new file mode 100644
index 0000000..477a123
Binary files /dev/null and b/static/images/2.png differ
diff --git a/static/images/22.png b/static/images/22.png
new file mode 100644
index 0000000..3b6f2c9
Binary files /dev/null and b/static/images/22.png differ
diff --git a/static/images/3-001.png b/static/images/3-001.png
deleted file mode 100644
index b55ee31..0000000
Binary files a/static/images/3-001.png and /dev/null differ
diff --git a/static/images/3-002.png b/static/images/3-002.png
deleted file mode 100644
index 4a0ca41..0000000
Binary files a/static/images/3-002.png and /dev/null differ
diff --git a/static/images/3.png b/static/images/3.png
new file mode 100644
index 0000000..3bea3f0
Binary files /dev/null and b/static/images/3.png differ
diff --git a/static/images/33.png b/static/images/33.png
new file mode 100644
index 0000000..6f4e147
Binary files /dev/null and b/static/images/33.png differ
diff --git a/static/images/4-001.png b/static/images/4-001.png
deleted file mode 100644
index 26d7fbe..0000000
Binary files a/static/images/4-001.png and /dev/null differ
diff --git a/static/images/4-002.png b/static/images/4-002.png
deleted file mode 100644
index f3304d7..0000000
Binary files a/static/images/4-002.png and /dev/null differ
diff --git a/static/images/4.png b/static/images/4.png
new file mode 100644
index 0000000..c1bdffe
Binary files /dev/null and b/static/images/4.png differ
diff --git a/static/images/44.png b/static/images/44.png
new file mode 100644
index 0000000..12255a0
Binary files /dev/null and b/static/images/44.png differ