Browse Source

处理冲突

Rorschach 6 years ago
parent
commit
966ece4d55
4 changed files with 18 additions and 20 deletions
  1. 0 4
      app.wxss
  2. 15 15
      component/group/group.js
  3. 2 1
      pages/index/index.js
  4. 1 0
      pages/main/singleBook/singleBook.json

+ 0 - 4
app.wxss

@@ -6,10 +6,6 @@ page {
 
 .container {
   height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
   padding-top: 80rpx;
   box-sizing: border-box;
 } 

+ 15 - 15
component/group/group.js

@@ -1,16 +1,16 @@
-export const groupInit =  (that) => {
-    that.setData({
-      groupData: {
-        title: '关注'
-      }
-    })
-    //请求数据封装
-    that.more = function () {
-      wx.navigateTo({
-        url: '/pages/discount-group/discount-group'
-      })
-      wx.setNavigationBarTitle({
-        title: '限量优惠团购'
-      })
+export const groupInit = (that) => {
+  that.setData({
+    groupData: {
+      title: '关注'
     }
-  }
+  })
+  //请求数据封装
+  that.more = function () {
+    wx.navigateTo({
+      url: '/pages/discount-group/discount-group'
+    })
+    wx.setNavigationBarTitle({
+      title: '限量优惠团购'
+    })
+  }
+}

+ 2 - 1
pages/index/index.js

@@ -1,8 +1,9 @@
 //index.js
 //获取应用实例
 const app = getApp()
-import { groupInit } from '../../component/group/group';
+
 import { hotInit } from '../../component/hot/hot';
+import { groupInit } from '../../component/group/group';
 import { myInit } from '../../component/my/my';
 import { followInit } from '../../component/follow/follow';
 // import '../../utils/hls';

+ 1 - 0
pages/main/singleBook/singleBook.json

@@ -0,0 +1 @@
+{}