Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat: cxw-010203 cxw-010203 # Conflicts: # app.json
3 years ago · 7ad3d81dc4
parent 433d3e8847 275ac32295
commit 7ad3d81dc4
13 changed files with 72 additions and 0 deletions
--- a/app.json
+++ b/app.json
@ -3,6 +3,12 @@
    "pages/index/index",
    "pages/bar/index",
    "pages/insight/index",
+<<<<<<< HEAD
+=======
+    "pages/brandSearch/index",
+    "pages/varComm/index",
+    "pages/mine/index",
+>>>>>>> 275ac3229537c1c42647ab6a5f402be5c1ea5aee
    "pages/logs/logs"
  ],
  "window": {
@ -19,6 +25,18 @@
      {
        "pagePath": "pages/insight/index",
        "text": "洞察"
+      },
+      {
+        "pagePath": "pages/brandSearch/index",
+        "text": "品牌搜索"
+      },
+      {
+        "pagePath": "pages/varComm/index",
+        "text": "对比"
+      },
+      {
+        "pagePath": "pages/mine/index",
+        "text": "我的"
      }
    ]
  },
--- a/pages/brandSearch/index.js
+++ b/pages/brandSearch/index.js
@ -0,0 +1,6 @@
+// index.js
+
+Page({
+    data: {
+    }
+});
--- a/pages/brandSearch/index.json
+++ b/pages/brandSearch/index.json
@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        
+    }
+}
--- a/pages/brandSearch/index.wxml
+++ b/pages/brandSearch/index.wxml
@ -0,0 +1,3 @@
+<view class="container">
+  <text>品牌搜索</text>
+</view>
--- a/pages/brandSearch/index.wxss
+++ b/pages/brandSearch/index.wxss
@ -0,0 +1,4 @@
+.container {
+    width: 100%;
+    height: 330px;
+}
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@ -0,0 +1,6 @@
+// index.js
+
+Page({
+    data: {
+    }
+});
--- a/pages/mine/index.json
+++ b/pages/mine/index.json
@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        
+    }
+}
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@ -0,0 +1,3 @@
+<view class="container">
+  <text>我的</text>
+</view>
--- a/pages/mine/index.wxss
+++ b/pages/mine/index.wxss
@ -0,0 +1,4 @@
+.container {
+    width: 100%;
+    height: 330px;
+}
--- a/pages/varComm/index.js
+++ b/pages/varComm/index.js
@ -0,0 +1,6 @@
+// index.js
+
+Page({
+    data: {
+    }
+});
--- a/pages/varComm/index.json
+++ b/pages/varComm/index.json
@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        
+    }
+}
--- a/pages/varComm/index.wxml
+++ b/pages/varComm/index.wxml
@ -0,0 +1,3 @@
+<view class="container">
+  <text>对比</text>
+</view>
--- a/pages/varComm/index.wxss
+++ b/pages/varComm/index.wxss
@ -0,0 +1,4 @@
+.container {
+    width: 100%;
+    height: 330px;
+}